The new image handling structure break the vmx guest loading, this patch
fix it.
Signed-off-by: Xiaofeng Ling <xiaofeng.ling@xxxxxxxxx>
diff -r fe916b4a7d74 -r 089ec1b6817c tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Fri Sep 16 02:53:39 2005
+++ b/tools/python/xen/xend/image.py Fri Sep 16 06:30:21 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':
# HG changeset patch
# User Xiaofeng Ling <xiaofeng.ling@xxxxxxxxx>
# Node ID 089ec1b6817cb9f2bff25093b4f88fc2af2efe1b
# Parent fe916b4a7d74a7564cc6397b4302a4457c5dbdd8
The new image handling struct break the vmx guest, this patch
fix it.
Signed-off-by: Xiaofeng Ling <xiaofeng.ling@xxxxxxxxx>
diff -r fe916b4a7d74 -r 089ec1b6817c tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Fri Sep 16 02:53:39 2005
+++ b/tools/python/xen/xend/image.py Fri Sep 16 06:30:21 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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home