# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1240184148 25200 # Node ID 6d914f871271725d4ed31abe4e35a5846b298fea # Parent 3220adb67645abf3784876851de4eab6748e76b3 [TEST] Check to see if either qemu or qemu-kvm is present on the system If the qemu binary doesn't exist, don't fail - check qemu-kvm first. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 3220adb67645 -r 6d914f871271 suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Sun Apr 19 16:34:19 2009 -0700 +++ b/suites/libvirt-cim/main.py Sun Apr 19 16:35:48 2009 -0700 @@ -107,12 +107,10 @@ cmd = "qemu -help" ret, out = utils.run_remote(ip, cmd) if ret != 0: - return "Encountered an error querying for qemu" - - cmd = "qemu-kvm -help" - ret, out = utils.run_remote(ip, cmd) - if ret != 0: - return "Encountered an error querying for qemu-kvm " + cmd = "qemu-kvm -help" + ret, out = utils.run_remote(ip, cmd) + if ret != 0: + return "Encountered an error querying for qemu-kvm and qemu " cmd = "ps -ef | grep -v grep | grep cimserver" rc, out = utils.run_remote(ip, cmd)