From patchwork Sun May 10 13:22:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 22798 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4ADNSHu030997 for ; Sun, 10 May 2009 13:23:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752024AbZEJNX0 (ORCPT ); Sun, 10 May 2009 09:23:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752292AbZEJNX0 (ORCPT ); Sun, 10 May 2009 09:23:26 -0400 Received: from mx2.redhat.com ([66.187.237.31]:34736 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751673AbZEJNXZ (ORCPT ); Sun, 10 May 2009 09:23:25 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n4ADNOBo010278; Sun, 10 May 2009 09:23:24 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n4ADMNxt010762; Sun, 10 May 2009 09:22:23 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n4ADMM3k007526; Sun, 10 May 2009 09:22:23 -0400 Received: from localhost.localdomain (cleopatra.tlv.redhat.com [10.35.255.11]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 51F82250061; Sun, 10 May 2009 16:22:22 +0300 (IDT) From: Avi Kivity To: Anthony Liguori Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [PATCH v2] Work around misreported kvm cpuid features Date: Sun, 10 May 2009 16:22:21 +0300 Message-Id: <1241961741-27607-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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 --- Changes from v1: - use CPUID_* instead of open coding constants target-i386/kvm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index fe67eed..86da72d 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -88,6 +88,10 @@ 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 |= CPUID_MTRR | CPUID_PAT | CPUID_MCA | CPUID_MCE; + } if (function == 0x80000001) { /* On Intel, kvm returns cpuid according to the Intel spec, * so add missing bits according to the AMD spec: