From patchwork Fri Sep 3 09:27:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 152761 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o839Rh7w031860 for ; Fri, 3 Sep 2010 09:27:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756580Ab0ICJ1X (ORCPT ); Fri, 3 Sep 2010 05:27:23 -0400 Received: from va3ehsobe006.messaging.microsoft.com ([216.32.180.16]:16637 "EHLO VA3EHSOBE009.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756563Ab0ICJ1R (ORCPT ); Fri, 3 Sep 2010 05:27:17 -0400 Received: from mail164-va3-R.bigfish.com (10.7.14.249) by VA3EHSOBE009.bigfish.com (10.7.40.29) with Microsoft SMTP Server id 8.1.340.0; Fri, 3 Sep 2010 09:27:16 +0000 Received: from mail164-va3 (localhost.localdomain [127.0.0.1]) by mail164-va3-R.bigfish.com (Postfix) with ESMTP id 31F1A1A000DF for ; Fri, 3 Sep 2010 09:27:16 +0000 (UTC) X-SpamScore: -2 X-BigFish: VPS-2(zzbb2cKzz1202hzz8275bhz32i2a8h43h62h) X-Spam-TCS-SCL: 1:0 Received: from mail164-va3 (localhost.localdomain [127.0.0.1]) by mail164-va3 (MessageSwitch) id 128350602735804_16815; Fri, 3 Sep 2010 09:27:07 +0000 (UTC) Received: from VA3EHSMHS024.bigfish.com (unknown [10.7.14.252]) by mail164-va3.bigfish.com (Postfix) with ESMTP id CF84F1B804F for ; Fri, 3 Sep 2010 09:27:04 +0000 (UTC) Received: from ausb3extmailp01.amd.com (163.181.251.8) by VA3EHSMHS024.bigfish.com (10.7.99.34) with Microsoft SMTP Server (TLS) id 14.0.482.44; Fri, 3 Sep 2010 09:26:59 +0000 Received: from ausb3twp02.amd.com ([163.181.250.38]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o839SX64004874 for ; Fri, 3 Sep 2010 04:28:56 -0500 X-WSS-ID: 0L85ZJM-02-0LT-02 X-M-MSG: Received: from sausexhtp02.amd.com (sausexhtp02.amd.com [163.181.3.152]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) by ausb3twp02.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 259FCC8602 for ; Fri, 3 Sep 2010 04:26:10 -0500 (CDT) Received: from storexhtp01.amd.com (172.24.4.3) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 3 Sep 2010 04:26:13 -0500 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp01.amd.com (172.24.4.3) with Microsoft SMTP Server id 8.3.83.0; Fri, 3 Sep 2010 05:26:12 -0400 Received: from localhost.localdomain (tronje.osrc.amd.com [165.204.15.48]) by gwo.osrc.amd.com (Postfix) with ESMTP id E51F949C0E9; Fri, 3 Sep 2010 10:26:11 +0100 (BST) From: Andre Przywara To: CC: Andre Przywara Subject: [PATCH 3/4] x86: Fix allowed CPUID bits for KVM guests Date: Fri, 3 Sep 2010 11:27:48 +0200 Message-ID: <1283506069-1096-4-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1283506069-1096-1-git-send-email-andre.przywara@amd.com> References: <1283506069-1096-1-git-send-email-andre.przywara@amd.com> MIME-Version: 1.0 X-Reverse-DNS: unknown Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 03 Sep 2010 09:27:45 +0000 (UTC) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3a09c62..eb89e7b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1996,8 +1996,8 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, const u32 kvm_supported_word6_x86_features = F(LAHF_LM) | F(CMP_LEGACY) | F(SVM) | 0 /* ExtApicSpace */ | F(CR8_LEGACY) | F(ABM) | F(SSE4A) | F(MISALIGNSSE) | - F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(SSE5) | - 0 /* SKINIT */ | 0 /* WDT */; + F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(XOP) | + 0 /* SKINIT, WDT, LWP */ | F(FMA4) | F(TBM); /* all calls to cpuid_count() should be made on the same cpu */ get_cpu();