cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [2/3] git commit: updated refs/heads/master to 63688e7
Date Mon, 13 Jul 2015 14:59:59 GMT
kvm: Write Libvirt instead of LibVirt


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24f8e66e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24f8e66e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24f8e66e

Branch: refs/heads/master
Commit: 24f8e66e93ed6dedb676593c78ff7d7436a63126
Parents: 7c37ba7
Author: Wido den Hollander <wido@42on.com>
Authored: Mon Jul 13 16:22:33 2015 +0200
Committer: Wido den Hollander <wido@42on.com>
Committed: Mon Jul 13 16:22:33 2015 +0200

----------------------------------------------------------------------
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24f8e66e/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 ac13308..58a303f 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -812,7 +812,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
Serv
 
             if (_bridgeType == BridgeType.OPENVSWITCH) {
                 if (conn.getLibVirVersion() < 10 * 1000 + 0) {
-                    throw new ConfigurationException("LibVirt version 0.10.0 required for
openvswitch support, but version " + conn.getLibVirVersion() + " detected");
+                    throw new ConfigurationException("Libvirt version 0.10.0 required for
openvswitch support, but version " + conn.getLibVirVersion() + " detected");
                 }
             }
         } catch (final LibvirtException e) {
@@ -842,7 +842,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
Serv
             _guestCpuModel = (String)params.get("guest.cpu.model");
 
             if (_hypervisorLibvirtVersion < 9 * 1000 + 10) {
-                s_logger.warn("LibVirt version 0.9.10 required for guest cpu mode, but version
" + prettyVersion(_hypervisorLibvirtVersion) +
+                s_logger.warn("Libvirt version 0.9.10 required for guest cpu mode, but version
" + prettyVersion(_hypervisorLibvirtVersion) +
                         " detected, so it will be disabled");
                 _guestCpuMode = "";
                 _guestCpuModel = "";


Mime
View raw message