ia64/xen-unstable

changeset 6911:a434b5449d59

Fix the control panel problem.
The new image handling structure broke the vmx guest loading.
Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Fri Sep 16 18:50:50 2005 +0000 (2005-09-16)
parents 7fbaf67a0af5
children a4cf3e17bb25
files tools/python/xen/xend/image.py
line diff
     1.1 --- a/tools/python/xen/xend/image.py	Fri Sep 16 13:27:01 2005 +0000
     1.2 +++ b/tools/python/xen/xend/image.py	Fri Sep 16 18:50:50 2005 +0000
     1.3 @@ -271,9 +271,10 @@ class VmxImageHandler(ImageHandler):
     1.4      def configure(self, config):
     1.5          ImageHandler.configure(self, config)
     1.6          if not config:
     1.7 -            self.memmap, self.dmargs, self.device_model, self.display = self.vm.gatherVm(
     1.8 +            self.memmap, dmargs, self.device_model, self.display = self.vm.gatherVm(
     1.9                  ("image/memmap"), ("image/dmargs"), ("image/device-model"),
    1.10                  ("image/display"))
    1.11 +            self.dmargs = dmargs.split(' ')
    1.12              return
    1.13          
    1.14          self.memmap = sxp.child_value(config, 'memmap')
    1.15 @@ -283,10 +284,10 @@ class VmxImageHandler(ImageHandler):
    1.16              raise VmError("vmx: missing device model")
    1.17          self.display = sxp.child_value(config, 'display')
    1.18  
    1.19 -        self.storeVm(("image/memmap", self.memmap),
    1.20 -                     ("image/dmargs", self.dmargs),
    1.21 -                     ("image/device-model", self.device_model),
    1.22 -                     ("image/display", self.display))
    1.23 +        self.vm.storeVm(("image/memmap", self.memmap),
    1.24 +                        ("image/dmargs", " ".join(self.dmargs)),
    1.25 +                        ("image/device-model", self.device_model),
    1.26 +                        ("image/display", self.display))
    1.27  
    1.28      def createImage(self):
    1.29          """Create a VM for the VMX environment.
    1.30 @@ -346,7 +347,7 @@ class VmxImageHandler(ImageHandler):
    1.31                  ret.append("%s" % v)
    1.32  
    1.33          # Handle disk/network related options
    1.34 -        devices = sxp.children(config, 'device')
    1.35 +        devices = sxp.children(self.vm.config, 'device')
    1.36          for device in devices:
    1.37              name = sxp.name(sxp.child0(device))
    1.38              if name == 'vbd':