From patchwork Mon Jun 28 16:14:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 108394 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5SGFsow025601 for ; Mon, 28 Jun 2010 16:15:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754185Ab0F1QPv (ORCPT ); Mon, 28 Jun 2010 12:15:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17874 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753212Ab0F1QPn (ORCPT ); Mon, 28 Jun 2010 12:15:43 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5SGFeaj020423 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 28 Jun 2010 12:15:40 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5SGFdh2024447; Mon, 28 Jun 2010 12:15:39 -0400 Received: from amt.cnet (vpn2-11-80.ams2.redhat.com [10.36.11.80]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o5SGFbZO017391; Mon, 28 Jun 2010 12:15:38 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 15A3768A892; Mon, 28 Jun 2010 13:14:32 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o5SGESws007578; Mon, 28 Jun 2010 13:14:28 -0300 From: Marcelo Tosatti To: Anthony Liguori Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Andre Przywara , Marcelo Tosatti Subject: [PATCH 2/7] fix CPUID vendor override Date: Mon, 28 Jun 2010 13:14:09 -0300 Message-Id: <8935499831312ec3e108287d3d49614915847ab2.1277741654.git.mtosatti@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 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 (demeter.kernel.org [140.211.167.41]); Mon, 28 Jun 2010 16:15:54 +0000 (UTC) diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index 6a0f7ca..fe0e6b2 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -982,7 +982,7 @@ static void get_cpuid_vendor(CPUX86State *env, uint32_t *ebx, * 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) { + if (kvm_enabled() && ! env->cpuid_vendor_override) { host_cpuid(0, 0, NULL, ebx, ecx, edx); } }