[Xen-changelog] merge?

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID a4cf3e17bb25e03a02f1c2e0a90c73402d5c2af8
# Parent  ffbc98d735bdb058a8cff968980ea276eddce146
# Parent  a434b5449d591dec79438a6d274ea3efd0034b75
merge?

diff -r ffbc98d735bd -r a4cf3e17bb25 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Fri Sep 16 18:07:50 2005
+++ b/tools/python/xen/xend/image.py    Fri Sep 16 18:59:59 2005
@@ -271,9 +271,10 @@
     def configure(self, config):
         ImageHandler.configure(self, config)
         if not config:
-            self.memmap, self.dmargs, self.device_model, self.display = 
self.vm.gatherVm(
+            self.memmap, dmargs, self.device_model, self.display = 
self.vm.gatherVm(
                 ("image/memmap"), ("image/dmargs"), ("image/device-model"),
                 ("image/display"))
+            self.dmargs = dmargs.split(' ')
             return
         
         self.memmap = sxp.child_value(config, 'memmap')
@@ -283,10 +284,10 @@
             raise VmError("vmx: missing device model")
         self.display = sxp.child_value(config, 'display')
 
-        self.storeVm(("image/memmap", self.memmap),
-                     ("image/dmargs", self.dmargs),
-                     ("image/device-model", self.device_model),
-                     ("image/display", self.display))
+        self.vm.storeVm(("image/memmap", self.memmap),
+                        ("image/dmargs", " ".join(self.dmargs)),
+                        ("image/device-model", self.device_model),
+                        ("image/display", self.display))
 
     def createImage(self):
         """Create a VM for the VMX environment.
@@ -346,7 +347,7 @@
                 ret.append("%s" % v)
 
         # Handle disk/network related options
-        devices = sxp.children(config, 'device')
+        devices = sxp.children(self.vm.config, 'device')
         for device in devices:
             name = sxp.name(sxp.child0(device))
             if name == 'vbd':

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog