14.1 --- a/tools/python/xen/xend/image.py	Fri Sep 16 18:07:50 2005 +0000
    14.2 +++ b/tools/python/xen/xend/image.py	Fri Sep 16 18:59:59 2005 +0000
    14.3 @@ -271,9 +271,10 @@ class VmxImageHandler(ImageHandler):
    14.4      def configure(self, config):
    14.5          ImageHandler.configure(self, config)
    14.6          if not config:
    14.7 -            self.memmap, self.dmargs, self.device_model, self.display = self.vm.gatherVm(
    14.8 +            self.memmap, dmargs, self.device_model, self.display = self.vm.gatherVm(
    14.9                  ("image/memmap"), ("image/dmargs"), ("image/device-model"),
   14.10                  ("image/display"))
   14.11 +            self.dmargs = dmargs.split(' ')
   14.12              return
   14.13          
   14.14          self.memmap = sxp.child_value(config, 'memmap')
   14.15 @@ -283,10 +284,10 @@ class VmxImageHandler(ImageHandler):
   14.16              raise VmError("vmx: missing device model")
   14.17          self.display = sxp.child_value(config, 'display')
   14.18  
   14.19 -        self.storeVm(("image/memmap", self.memmap),
   14.20 -                     ("image/dmargs", self.dmargs),
   14.21 -                     ("image/device-model", self.device_model),
   14.22 -                     ("image/display", self.display))
   14.23 +        self.vm.storeVm(("image/memmap", self.memmap),
   14.24 +                        ("image/dmargs", " ".join(self.dmargs)),
   14.25 +                        ("image/device-model", self.device_model),
   14.26 +                        ("image/display", self.display))
   14.27  
   14.28      def createImage(self):
   14.29          """Create a VM for the VMX environment.
   14.30 @@ -346,7 +347,7 @@ class VmxImageHandler(ImageHandler):
   14.31                  ret.append("%s" % v)
   14.32  
   14.33          # Handle disk/network related options
   14.34 -        devices = sxp.children(config, 'device')
   14.35 +        devices = sxp.children(self.vm.config, 'device')
   14.36          for device in devices:
   14.37              name = sxp.name(sxp.child0(device))
   14.38              if name == 'vbd':