[PATCH] [TEST] Fix order XenFV args are passed to VirtCIM __init__()
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1260576721 28800 # Node ID 4c73bb18cd2d6144debd06135ad8de6e569f6747 # Parent ceb3cf5bc4d887de99e59f8c1ca7833ed0550b22 [TEST] Fix order XenFV args are passed to VirtCIM __init__() When the acip, pae, and acpi args were added, they were added in the wrong order for XenFV guests. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r ceb3cf5bc4d8 -r 4c73bb18cd2d suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Dec 11 16:12:01 2009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Dec 11 16:12:01 2009 -0800 @@ -955,7 +955,7 @@ logger.error('Error: Disk image does not exist') sys.exit(1) VirtXML.__init__(self, 'xenfv', test_dom, set_uuid(), mem, vcpus) - VirtCIM.__init__(self, 'XenFV', test_dom, disk, uuid, pae, acpi, apic, + VirtCIM.__init__(self, 'XenFV', test_dom, uuid, pae, acpi, apic, disk, disk_file_path, ntype, net_name, mac, vcpus, mem, mem_allocunits, emu_type, grstype, address, is_ipv6_only, port_num, @@ -964,6 +964,8 @@ self._devices(const.XenFV_default_emulator, ntype, mac, net_name, disk_file_path, disk) + print address, port_num, is_ipv6_only + def _os(self, os_loader): os = self.get_node('/domain/os') self.add_sub_node(os, 'type', 'hvm')
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1260576721 28800 # Node ID 4c73bb18cd2d6144debd06135ad8de6e569f6747 # Parent ceb3cf5bc4d887de99e59f8c1ca7833ed0550b22 [TEST] Fix order XenFV args are passed to VirtCIM __init__()
When the acip, pae, and acpi args were added, they were added in the
wrong
order for XenFV guests.
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r ceb3cf5bc4d8 -r 4c73bb18cd2d suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Dec 11 16:12:012009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Dec 11 16:12:012009 -0800 @@ -955,7 +955,7 @@ logger.error('Error: Disk image does not exist') sys.exit(1) VirtXML.__init__(self, 'xenfv', test_dom, set_uuid(), mem, vcpus) - VirtCIM.__init__(self, 'XenFV', test_dom, disk, uuid, pae, acpi, apic, + VirtCIM.__init__(self, 'XenFV', test_dom, uuid, pae, acpi, apic, disk, disk_file_path, ntype, net_name, mac, vcpus, mem, mem_allocunits, emu_type, grstype, address, is_ipv6_only, port_num, @@ -964,6 +964,8 @@ self._devices(const.XenFV_default_emulator, ntype, mac, net_name, disk_file_path, disk)
+ print address, port_num, is_ipv6_only +
Do you want to leave the print statement there? I don't mind.
def _os(self, os_loader): os = self.get_node('/domain/os') self.add_sub_node(os, 'type', 'hvm')
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
Sharad Mishra wrote:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1260576721 28800 # Node ID 4c73bb18cd2d6144debd06135ad8de6e569f6747 # Parent ceb3cf5bc4d887de99e59f8c1ca7833ed0550b22 [TEST] Fix order XenFV args are passed to VirtCIM __init__()
When the acip, pae, and acpi args were added, they were added in the
wrong
order for XenFV guests.
Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com>
diff -r ceb3cf5bc4d8 -r 4c73bb18cd2d suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Dec 11 16:12:012009 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Dec 11 16:12:012009 -0800 @@ -955,7 +955,7 @@ logger.error('Error: Disk image does not exist') sys.exit(1) VirtXML.__init__(self, 'xenfv', test_dom, set_uuid(), mem, vcpus) - VirtCIM.__init__(self, 'XenFV', test_dom, disk, uuid, pae, acpi, apic, + VirtCIM.__init__(self, 'XenFV', test_dom, uuid, pae, acpi, apic, disk, disk_file_path, ntype, net_name, mac, vcpus, mem, mem_allocunits, emu_type, grstype, address, is_ipv6_only, port_num, @@ -964,6 +964,8 @@ self._devices(const.XenFV_default_emulator, ntype, mac, net_name, disk_file_path, disk)
+ print address, port_num, is_ipv6_only +
Do you want to leave the print statement there? I don't mind.
Oops, nope - that should be removed. That was my fault for not reviewing the patch well before sending it. I'll rework this. Thanks! -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com
participants (2)
-
Kaitlin Rupert -
Sharad Mishra