From patchwork Tue Sep 7 11:27:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 160391 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 o87BWZ3w003372 for ; Tue, 7 Sep 2010 11:32:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756494Ab0IGLcc (ORCPT ); Tue, 7 Sep 2010 07:32:32 -0400 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.31]:45497 "EHLO VA3EHSOBE005.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756085Ab0IGLcb (ORCPT ); Tue, 7 Sep 2010 07:32:31 -0400 Received: from mail88-va3-R.bigfish.com (10.7.14.246) by VA3EHSOBE005.bigfish.com (10.7.40.25) with Microsoft SMTP Server id 8.1.340.0; Tue, 7 Sep 2010 11:32:31 +0000 Received: from mail88-va3 (localhost.localdomain [127.0.0.1]) by mail88-va3-R.bigfish.com (Postfix) with ESMTP id 7EE17F481E8; Tue, 7 Sep 2010 11:32:30 +0000 (UTC) X-SpamScore: 1 X-BigFish: VS1(zzzz1202hzz8275bhz32i2a8h87h61h) X-Spam-TCS-SCL: 0:0 X-FB-DOMAIN-IP-MATCH: fail Received: from mail88-va3 (localhost.localdomain [127.0.0.1]) by mail88-va3 (MessageSwitch) id 1283859148882821_14176; Tue, 7 Sep 2010 11:32:28 +0000 (UTC) Received: from VA3EHSMHS009.bigfish.com (unknown [10.7.14.254]) by mail88-va3.bigfish.com (Postfix) with ESMTP id CC44813A004E; Tue, 7 Sep 2010 11:32:28 +0000 (UTC) Received: from ausb3extmailp02.amd.com (163.181.251.22) by VA3EHSMHS009.bigfish.com (10.7.99.19) with Microsoft SMTP Server (TLS) id 14.0.482.44; Tue, 7 Sep 2010 11:32:17 +0000 Received: from ausb3twp01.amd.com (ausb3twp01.amd.com [163.181.250.37]) by ausb3extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with SMTP id o87BSrHN013570; Tue, 7 Sep 2010 06:30:33 -0500 X-WSS-ID: 0L8DJTZ-01-MBU-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 ausb3twp01.amd.com (Tumbleweed MailGate 3.7.2) with ESMTP id 2D904102868D; Tue, 7 Sep 2010 06:27:35 -0500 (CDT) Received: from storexhtp02.amd.com (172.24.4.4) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 7 Sep 2010 06:27:38 -0500 Received: from gwo.osrc.amd.com (165.204.16.204) by storexhtp02.amd.com (172.24.4.4) with Microsoft SMTP Server id 8.3.83.0; Tue, 7 Sep 2010 07:27:37 -0400 Received: from lemmy.osrc.amd.com (lemmy.osrc.amd.com [165.204.15.93]) by gwo.osrc.amd.com (Postfix) with ESMTP id 2224249C1F5; Tue, 7 Sep 2010 12:27:37 +0100 (BST) Received: by lemmy.osrc.amd.com (Postfix, from userid 1000) id CDEFBA0581; Tue, 7 Sep 2010 13:27:37 +0200 (CEST) From: Joerg Roedel To: Avi Kivity , Marcelo Tosatti CC: , , Joerg Roedel Subject: [PATCH 1/3] qemu-kvm: Invert svm-flag setting logic Date: Tue, 7 Sep 2010 13:27:21 +0200 Message-ID: <1283858843-21330-2-git-send-email-joerg.roedel@amd.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1283858843-21330-1-git-send-email-joerg.roedel@amd.com> References: <1283858843-21330-1-git-send-email-joerg.roedel@amd.com> MIME-Version: 1.0 X-Reverse-DNS: ausb3extmailp02.amd.com 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]); Tue, 07 Sep 2010 11:32:35 +0000 (UTC) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index d63fdcb..5fa0dd0 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -276,8 +276,8 @@ static x86_def_t builtin_x86_defs[] = { .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_CX16 | CPUID_EXT_POPCNT, .ext2_features = (PPRO_FEATURES & EXT2_FEATURE_MASK) | CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX, - .ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | - CPUID_EXT3_ABM | CPUID_EXT3_SSE4A, + .ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_ABM | + CPUID_EXT3_SSE4A, .xlevel = 0x8000000A, .model_id = "QEMU Virtual CPU version " QEMU_VERSION, }, @@ -303,8 +303,8 @@ static x86_def_t builtin_x86_defs[] = { CPUID_EXT3_CR8LEG, CPUID_EXT3_MISALIGNSSE, CPUID_EXT3_3DNOWPREFETCH, CPUID_EXT3_OSVW, CPUID_EXT3_IBS */ - .ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | - CPUID_EXT3_ABM | CPUID_EXT3_SSE4A, + .ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_ABM | + CPUID_EXT3_SSE4A, .xlevel = 0x8000001A, .model_id = "AMD Phenom(tm) 9550 Quad-Core Processor" }, @@ -1154,8 +1154,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, /* disable CPU features that KVM cannot support */ /* svm */ - if (!kvm_nested) - *ecx &= ~CPUID_EXT3_SVM; + if (kvm_nested) + *ecx |= CPUID_EXT3_SVM; /* 3dnow */ *edx &= ~0xc0000000; }