You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/04/30 04:12:52 UTC
git commit: updated refs/heads/4.5 to 4334c44
Repository: cloudstack
Updated Branches:
refs/heads/4.5 a4120b24e -> 4334c446b
CLOUDSTACK-8424: enable cpu flags only for guest VMs
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4334c446
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4334c446
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4334c446
Branch: refs/heads/4.5
Commit: 4334c446b55409d84ff039c6be446d437bc97171
Parents: a4120b2
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Apr 30 00:46:58 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 30 04:12:32 2015 +0200
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4334c446/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 ef50e02..7e7afb0 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
@@ -3685,7 +3685,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
CpuModeDef cmd = new CpuModeDef();
cmd.setMode(_guestCpuMode);
cmd.setModel(_guestCpuModel);
- cmd.setFeatures(_cpuFeatures);
+ if (vmTO.getType() == VirtualMachine.Type.User) {
+ cmd.setFeatures(_cpuFeatures);
+ }
// multi cores per socket, for larger core configs
if (vcpus % 6 == 0) {
int sockets = vcpus / 6;