You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2015/01/29 07:41:44 UTC
git commit: updated refs/heads/master to fa76b3c
Repository: cloudstack
Updated Branches:
refs/heads/master b9ae18c5f -> fa76b3c9f
LibvirtComputingResource: make Oracle linux support virtio
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa76b3c9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa76b3c9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa76b3c9
Branch: refs/heads/master
Commit: fa76b3c9f5deb82b55fac2087380913452bb5efb
Parents: b9ae18c
Author: Marcus Sorensen <ma...@apple.com>
Authored: Wed Jan 28 23:19:03 2015 -0700
Committer: Marcus Sorensen <ma...@apple.com>
Committed: Wed Jan 28 23:41:33 2015 -0700
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa76b3c9/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 4db8cfa..225f597 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
@@ -4748,7 +4748,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
guestOSName.startsWith("CentOS 5.5") || guestOSName.startsWith("CentOS") || guestOSName.startsWith("Fedora") ||
guestOSName.startsWith("Red Hat Enterprise Linux 5.3") || guestOSName.startsWith("Red Hat Enterprise Linux 5.4") ||
guestOSName.startsWith("Red Hat Enterprise Linux 5.5") || guestOSName.startsWith("Red Hat Enterprise Linux 6") || guestOSName.startsWith("Debian GNU/Linux") ||
- guestOSName.startsWith("FreeBSD 10") || guestOSName.startsWith("Other PV")) {
+ guestOSName.startsWith("FreeBSD 10") || guestOS.startsWith("Oracle Enterprise Linux") || guestOSName.startsWith("Other PV")) {
return true;
} else {
return false;