# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 7ac99b43f87920144cbe268016c7e346dedd99fb
# Parent 9b713b8d11000025b47a47fc946e7b331ca6eb9b
Allow multiple disk images per guest.
Signed-off-by: Yunfeng Zhao <yunfeng.zhao@xxxxxxxxx>
Signed-off-by: Arun Sharma <arun.sharma@xxxxxxxxx>
diff -r 9b713b8d1100 -r 7ac99b43f879 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Mon Jul 25 21:02:24 2005
+++ b/tools/python/xen/xend/image.py Mon Jul 25 21:02:34 2005
@@ -284,18 +284,19 @@
ret.append("%s" % v)
# Handle hd img related options
- device = sxp.child(self.vm.config, 'device')
- vbdinfo = sxp.child(device, 'vbd')
- if not vbdinfo:
- raise VmError("vmx: missing vbd configuration")
- uname = sxp.child_value(vbdinfo, 'uname')
- vbddev = sxp.child_value(vbdinfo, 'dev')
- (vbdtype, vbdparam) = string.split(uname, ':', 1)
- vbddev_list = ['hda', 'hdb', 'hdc', 'hdd']
- if vbdtype != 'file' or vbddev not in vbddev_list:
- raise VmError("vmx: for qemu vbd type=file&dev=hda~hdd")
- ret.append("-%s" % vbddev)
- ret.append("%s" % vbdparam)
+ devices = sxp.children(self.vm.config, 'device')
+ for device in devices:
+ vbdinfo = sxp.child(device, 'vbd')
+ if not vbdinfo:
+ raise VmError("vmx: missing vbd configuration")
+ uname = sxp.child_value(vbdinfo, 'uname')
+ vbddev = sxp.child_value(vbdinfo, 'dev')
+ (vbdtype, vbdparam) = string.split(uname, ':', 1)
+ vbddev_list = ['hda', 'hdb', 'hdc', 'hdd']
+ if vbdtype != 'file' or vbddev not in vbddev_list:
+ raise VmError("vmx: for qemu vbd type=file&dev=hda~hdd")
+ ret.append("-%s" % vbddev)
+ ret.append("%s" % vbdparam)
# Handle graphics library related options
vnc = sxp.child_value(self.vm.config, 'vnc')
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|