From patchwork Thu Sep 10 22:20:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 33393 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 7E56FB6F56 for ; Fri, 11 Sep 2009 08:32:33 +1000 (EST) Received: from localhost ([127.0.0.1]:56639 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlsBn-0008F4-Tw for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2009 18:32:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mls3y-0004cu-DM for qemu-devel@nongnu.org; Thu, 10 Sep 2009 18:24:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mls3r-0004Vy-8l for qemu-devel@nongnu.org; Thu, 10 Sep 2009 18:24:20 -0400 Received: from [199.232.76.173] (port=40028 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mls3r-0004Vq-5h for qemu-devel@nongnu.org; Thu, 10 Sep 2009 18:24:15 -0400 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14]:37637 helo=TX2EHSOBE008.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1Mls3q-0001Jm-ND for qemu-devel@nongnu.org; Thu, 10 Sep 2009 18:24:14 -0400 Received: from mail105-tx2-R.bigfish.com (10.9.14.244) by TX2EHSOBE008.bigfish.com (10.9.40.28) with Microsoft SMTP Server id 8.1.340.0; Thu, 10 Sep 2009 22:24:13 +0000 Received: from mail105-tx2 (localhost.localdomain [127.0.0.1]) by mail105-tx2-R.bigfish.com (Postfix) with ESMTP id 5693A200253 for ; Thu, 10 Sep 2009 22:24:13 +0000 (UTC) X-SpamScore: 3 X-BigFish: VPS3(zzzz1202hzzz32i203h43j62h) X-Spam-TCS-SCL: 1:0 X-FB-SS: 5, Received: by mail105-tx2 (MessageSwitch) id 1252621451821152_20995; Thu, 10 Sep 2009 22:24:11 +0000 (UCT) Received: from ausb3extmailp01.amd.com (unknown [163.181.251.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail105-tx2.bigfish.com (Postfix) with ESMTP id 99A49C90046 for ; Thu, 10 Sep 2009 22:24:11 +0000 (UTC) Received: from ausb3twp01.amd.com ([163.181.250.37]) by ausb3extmailp01.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n8AMO5L0020689 for ; Thu, 10 Sep 2009 17:24:08 -0500 X-WSS-ID: 0KPS0W5-01-L77-02 X-M-MSG: Received: from sausexbh2.amd.com (SAUSEXBH2.amd.com [163.181.22.102]) by ausb3twp01.amd.com (Tumbleweed MailGate 3.7.0) with ESMTP id 2363610284D0 for ; Thu, 10 Sep 2009 17:24:05 -0500 (CDT) Received: from sausexmb5.amd.com ([163.181.49.129]) by sausexbh2.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 17:24:05 -0500 Received: from SDRSEXMB1.amd.com ([172.20.3.116]) by sausexmb5.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 10 Sep 2009 17:24:05 -0500 Received: from localhost.localdomain ([165.204.15.42]) by SDRSEXMB1.amd.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 11 Sep 2009 00:23:55 +0200 From: Andre Przywara To: qemu-devel@nongnu.org Date: Fri, 11 Sep 2009 00:20:49 +0200 Message-ID: <1252621257-26364-5-git-send-email-andre.przywara@amd.com> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1252621257-26364-1-git-send-email-andre.przywara@amd.com> References: <1252621257-26364-1-git-send-email-andre.przywara@amd.com> X-OriginalArrivalTime: 10 Sep 2009 22:23:55.0340 (UTC) FILETIME=[6228B0C0:01CA3265] MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ Cc: Andre Przywara Subject: [Qemu-devel] [PATCH 04/12] cpuid: fix comments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Some comments regarding CPUID features were not up-to-date. - Nested SVM is supported in qemu-kvm, but not in upstream qemu (yet). - We support syscall/sysenter emulation in KVM now, so the comment explaining the vendor string issue can be more relaxed. Signed-off-by: Andre Przywara --- target-i386/cpuid.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index 9ed9fb2..7b69ff4 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -610,10 +610,12 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, *edx = env->cpuid_vendor2; *ecx = env->cpuid_vendor3; - /* sysenter isn't supported on compatibility mode on AMD. and syscall - * isn't supported in compatibility mode on Intel. so advertise the - * actuall cpu, and say goodbye to migration between different vendors - * is you use compatibility mode. */ + /* sysenter isn't supported on compatibility mode on AMD, syscall + * isn't supported in compatibility mode on Intel. + * Normally we advertise the actual cpu vendor, but you can override + * this if you want to use KVM's sysenter/syscall emulation + * in compatibility mode and when doing cross vendor migration + */ if (kvm_enabled() && !env->cpuid_vendor_override) host_cpuid(0, 0, NULL, ebx, ecx, edx); break; @@ -720,7 +722,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, } if (kvm_enabled()) { - /* Nested SVM not yet supported in KVM */ + /* Nested SVM not yet supported in upstream QEMU */ *ecx &= ~CPUID_EXT3_SVM; } else { /* AMD 3DNow! is not supported in QEMU */