From patchwork Mon Dec 28 08:48:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 69949 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBS8mAwm016183 for ; Mon, 28 Dec 2009 08:48:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884AbZL1IsI (ORCPT ); Mon, 28 Dec 2009 03:48:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751876AbZL1IsI (ORCPT ); Mon, 28 Dec 2009 03:48:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55402 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751846AbZL1IsE (ORCPT ); Mon, 28 Dec 2009 03:48:04 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBS8m2Vw002794 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 28 Dec 2009 03:48:02 -0500 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBS8m0D7018683; Mon, 28 Dec 2009 03:48:01 -0500 Received: from localhost.localdomain (file.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 663E625004D; Mon, 28 Dec 2009 10:48:00 +0200 (IST) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH] Reinstate cpuid vendor override when kvm is enabled Date: Mon, 28 Dec 2009 10:48:00 +0200 Message-Id: <1261990080-15330-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/target-i386/helper.c b/target-i386/helper.c index 9a50da6..b58fd82 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -518,7 +518,7 @@ static int cpu_x86_register (CPUX86State *env, const char *cpu_model) env->cpuid_vendor2 = CPUID_VENDOR_INTEL_2; env->cpuid_vendor3 = CPUID_VENDOR_INTEL_3; } - env->cpuid_vendor_override = def->vendor_override; + env->cpuid_vendor_override = def->vendor_override || kvm_enabled(); env->cpuid_level = def->level; if (def->family > 0x0f) env->cpuid_version = 0xf00 | ((def->family - 0x0f) << 20);