@@ -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'
I just worked up a patch that adds the Emulator attribute. So now
cim_define() needs to be modified to set the Emulator attribute of the
VSSD reference.
Also, I tested this set on Xen - looks good. I think this is ready to
be resubmitted (with the emulator change).
--
Kaitlin Rupert
IBM Linux Technology Center
kaitlin(a)linux.vnet.ibm.com