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