This should be no longer necessary.
Effectively reverts 143eb2bd043e82bcf353cf82d33c127f06411d82.

Signed-off-by: Andre Przywara <andre.przyw...@amd.com>
---
 kvm/libkvm/libkvm-x86.c |    9 ---------
 qemu-kvm-x86.c          |    9 ---------
 2 files changed, 0 insertions(+), 18 deletions(-)

Hi Avi,

I am not sure what caused your problem back in May when you committed this,
but it seems to work without this now. I booted Win7RC 64bit and WinXP 64bit
and saw no problems.

Regards,
Andre.

diff --git a/kvm/libkvm/libkvm-x86.c b/kvm/libkvm/libkvm-x86.c
index 9ca77d5..67f41b4 100644
--- a/kvm/libkvm/libkvm-x86.c
+++ b/kvm/libkvm/libkvm-x86.c
@@ -639,15 +639,6 @@ uint32_t kvm_get_supported_cpuid(kvm_context_t kvm, 
uint32_t function, int reg)
                                break;
                        case R_EDX:
                                ret = cpuid->entries[i].edx;
-                                if (function == 1) {
-                                    /* kvm misreports the following features
-                                     */
-                                    ret |= 1 << 12; /* MTRR */
-                                    ret |= 1 << 16; /* PAT */
-                                    ret |= 1 << 7;  /* MCE */
-                                    ret |= 1 << 14; /* MCA */
-                                }
-
                                /* On Intel, kvm returns cpuid according to
                                 * the Intel spec, so add missing bits
                                 * according to the AMD spec:
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 7505380..2811665 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -649,15 +649,6 @@ uint32_t kvm_get_supported_cpuid(kvm_context_t kvm, 
uint32_t function, int reg)
                                break;
                        case R_EDX:
                                ret = cpuid->entries[i].edx;
-                                if (function == 1) {
-                                    /* kvm misreports the following features
-                                     */
-                                    ret |= 1 << 12; /* MTRR */
-                                    ret |= 1 << 16; /* PAT */
-                                    ret |= 1 << 7;  /* MCE */
-                                    ret |= 1 << 14; /* MCA */
-                                }
-
                                /* On Intel, kvm returns cpuid according to
                                 * the Intel spec, so add missing bits
                                 * according to the AMD spec:
-- 
1.6.1.3


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to