# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1237384005 25200 # Node ID 26b80beef9adac44d524266ca1600c08b1742e53 # Parent 783c9510aaf930a05766707da9a5569f491cad60 [TEST]Modifying emulator information to be used for KVM. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 783c9510aaf9 -r 26b80beef9ad suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Wed Mar 18 06:41:56 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Wed Mar 18 06:46:45 2009 -0700 @@ -82,10 +82,12 @@ Xen_default_mac = '11:22:33:aa:bb:cc' # vxml.KVMXML -if fv_cap(CIM_IP): - KVM_default_emulator = '/usr/bin/qemu-kvm' -else: - KVM_default_emulator = '/usr/bin/qemu' +KVM_default_emulator = '/usr/local/bin/qemu-system-x86_64' +if not os.path.exists(KVM_default_emulator): + if fv_cap(CIM_IP): + KVM_default_emulator = '/usr/bin/qemu-kvm' + else: + KVM_default_emulator = '/usr/bin/qemu' KVM_disk_path = os.path.join(_image_dir, 'default-kvm-dimage') KVM_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND') KVM_default_disk_dev = 'hda' @@ -115,6 +117,8 @@ parser = OptionParser() parser.add_option("-i", "--ip", dest="ip", default="localhost", help="IP address of machine to test, default: localhost") +parser.add_option("-m", "--target_url", dest="t_url", default="localhost:5988", + help="URL of destination host for remote migration ") parser.add_option("-v", "--virt", dest="virt", type="choice", choices=['Xen', 'KVM', 'XenFV', 'LXC'], default="Xen", help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV' & 'LXC', default: Xen")