From: Gleb Natapov <gleb@redhat.com>
Date: Tue, 11 May 2010 06:41:25 +0000 (+0300)
Subject: kvm: fix 80000001.EDX supported bit filtering
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c1667e409764bb43a8196e40d01c409326d54a96;p=qemu.git

kvm: fix 80000001.EDX supported bit filtering

On AMD some bits from 1.EDX are reported in 80000001.EDX. The mask used
to copy bits from 1.EDX to 80000001.EDX is incorrect resulting in
unsupported features passed into a guest.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 676aa60791..d6b12edab7 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -111,7 +111,7 @@ uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, int reg)
                      * so add missing bits according to the AMD spec:
                      */
                     cpuid_1_edx = kvm_arch_get_supported_cpuid(env, 1, R_EDX);
-                    ret |= cpuid_1_edx & 0xdfeff7ff;
+                    ret |= cpuid_1_edx & 0x183f7ff;
                     break;
                 }
                 break;