# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1231816020 28800 # Node ID 1ac5b107e0f047c30d6a0044735b09e3fe144100 # Parent 43bf01b82ce9f627af1b5db55922b0584cd0e3b4 [TEST] Fix none value for disk assigned for Xen Signed-off-by: Guolian Yun<yunguol@cn.ibm.com> diff -r 43bf01b82ce9 -r 1ac5b107e0f0 suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Mon Jan 12 08:22:47 2009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Mon Jan 12 19:07:00 2009 -0800 @@ -249,16 +249,18 @@ if virt == 'KVM': disk_dev = 'hda' disk_source = const.KVM_disk_path - d = class_dasd(disk_dev, disk_source, dom_name, emu_type) elif virt == 'XenFV': disk_dev = 'hda' disk_source = const.XenFV_disk_path - d = class_dasd(disk_dev, disk_source, dom_name, emu_type) elif virt == 'LXC': disk_dev = const.LXC_default_mp disk_source = const.LXC_default_source + + if virt == 'LXC': d = class_dasd(disk_dev, disk_source, dom_name) - + else: + # Xen's case falls in here using the default values + d = class_dasd(disk_dev, disk_source, dom_name, emu_type) class_masd = get_masd_class(virt) m = class_masd( megabytes=mem_mb,