5544c1
From b82c558c781a79e6facf06e7cddf4771b8abf962 Mon Sep 17 00:00:00 2001
5544c1
From: Eduardo Habkost <ehabkost@redhat.com>
5544c1
Date: Thu, 6 Sep 2012 10:05:35 +0000
5544c1
Subject: [PATCH] i386: kvm: bit 10 of CPUID[8000_0001].EDX is reserved
5544c1
5544c1
Bit 10 of CPUID[8000_0001].EDX is not defined as an alias of
5544c1
CPUID[1].EDX[10], so do not duplicate it on
5544c1
kvm_arch_get_supported_cpuid().
5544c1
5544c1
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
5544c1
Reviewed-By: Igor Mammedov <imammedo@redhat.com>
5544c1
Reviewed-by: Don Slutz <Don@CloudSwitch.com>
5544c1
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
5544c1
(cherry picked from commit b1f4679392a03f2b26a37bfa52e95d6cc4f73d82)
5544c1
5544c1
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
5544c1
---
5544c1
 target-i386/kvm.c | 2 +-
5544c1
 1 file changed, 1 insertion(+), 1 deletion(-)
5544c1
5544c1
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
5544c1
index 6790180..acb9369 100644
5544c1
--- a/target-i386/kvm.c
5544c1
+++ b/target-i386/kvm.c
5544c1
@@ -165,7 +165,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
5544c1
                      * so add missing bits according to the AMD spec:
5544c1
                      */
5544c1
                     cpuid_1_edx = kvm_arch_get_supported_cpuid(s, 1, 0, R_EDX);
5544c1
-                    ret |= cpuid_1_edx & 0x183f7ff;
5544c1
+                    ret |= cpuid_1_edx & 0x183f3ff;
5544c1
                     break;
5544c1
                 }
5544c1
                 break;