From 4334c446b55409d84ff039c6be446d437bc97171 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Thu, 30 Apr 2015 00:46:58 +0200
Subject: [PATCH] CLOUDSTACK-8424: enable cpu flags only for guest VMs

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 .../hypervisor/kvm/resource/LibvirtComputingResource.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 ef50e0277f0..7e7afb05068 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;