kvm: Remove hardcoded 'cloud' qemu binaries for Hypervisor detection With the upcoming Apache release we don't ship custom Qemu builds.
libvirt should provide us with the correct information. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a1b9b521 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a1b9b521 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a1b9b521 Branch: refs/heads/vpc Commit: a1b9b5216439627f8b845cf2dd6c91c5430a6cea Parents: c6e58b6 Author: Wido den Hollander <[email protected]> Authored: Tue Aug 7 22:34:52 2012 +0200 Committer: Wido den Hollander <[email protected]> Committed: Tue Aug 7 23:17:52 2012 +0200 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 22 ++++----------- 1 files changed, 6 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a1b9b521/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 026b914..359497e 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3597,23 +3597,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements } private String getHypervisorPath(Connect conn) { - File f = new File("/usr/bin/cloud-qemu-kvm"); - if (f.exists()) { - return "/usr/bin/cloud-qemu-kvm"; - } else { - f = new File("/usr/libexec/cloud-qemu-kvm"); - if (f.exists()) { - return "/usr/libexec/cloud-qemu-kvm"; - } - - LibvirtCapXMLParser parser = new LibvirtCapXMLParser(); - try { - parser.parseCapabilitiesXML(conn.getCapabilities()); - } catch (LibvirtException e) { - - } - return parser.getEmulator(); + LibvirtCapXMLParser parser = new LibvirtCapXMLParser(); + try { + parser.parseCapabilitiesXML(conn.getCapabilities()); + } catch (LibvirtException e) { + s_logger.debug(e.getMessage()); } + return parser.getEmulator(); } private String getGuestType(Connect conn, String vmName) {
