From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M38Q4-0000zs-Pd for qemu-devel@nongnu.org; Sun, 10 May 2009 08:46:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M38Pz-0000y1-5p for qemu-devel@nongnu.org; Sun, 10 May 2009 08:46:15 -0400 Received: from [199.232.76.173] (port=46389 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M38Pz-0000xy-2B for qemu-devel@nongnu.org; Sun, 10 May 2009 08:46:11 -0400 Received: from mx2.redhat.com ([66.187.237.31]:60271) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M38Py-0003Vl-KG for qemu-devel@nongnu.org; Sun, 10 May 2009 08:46:10 -0400 From: Avi Kivity Date: Sun, 10 May 2009 15:45:05 +0300 Message-Id: <1241959505-22031-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH] Work around misreported kvm cpuid features List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org kvm misreports MCA, MCE, MTRR, and PAT as unsupported. This causes Vista to fail. Since QEMU does not support any version of kvm that does not actually support these features, it is safe to enable them unconditionally. These features are needed by Vista x64 to boot. Signed-off-by: Avi Kivity --- target-i386/kvm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index fe67eed..a7b7ae3 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -88,6 +88,13 @@ uint32_t kvm_arch_get_supported_cpuid(CPUState *env, 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 */ + } if (function == 0x80000001) { /* On Intel, kvm returns cpuid according to the Intel spec, * so add missing bits according to the AMD spec: -- 1.6.1.1