Patchwork [12/12] kvm: fix 80000001.EDX supported bit filtering

login
register
mail settings
Submitter Marcelo Tosatti
Date May 12, 2010, 9:25 p.m.
Message ID <c1667e409764bb43a8196e40d01c409326d54a96.1273699506.git.mtosatti@redhat.com>
Download mbox | patch
Permalink /patch/52426/
State New
Headers show

Comments

Marcelo Tosatti - May 12, 2010, 9:25 p.m.
From: Gleb Natapov <gleb@redhat.com>

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>
---
 target-i386/kvm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 676aa60..d6b12ed 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;