From patchwork Mon Dec 17 16:01:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 206922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B60B02C007B for ; Tue, 18 Dec 2012 03:59:40 +1100 (EST) Received: from localhost ([::1]:57225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkd9a-0006w8-73 for incoming@patchwork.ozlabs.org; Mon, 17 Dec 2012 11:02:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkd95-0005oI-3W for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:02:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tkd90-0001tu-1d for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:02:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkd8z-0001sZ-QU for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:02:17 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBHG29i8018822 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 17 Dec 2012 11:02:09 -0500 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qBHG1aVJ031501; Mon, 17 Dec 2012 11:02:08 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 17:01:23 +0100 Message-Id: <1355760092-18755-12-git-send-email-imammedo@redhat.com> In-Reply-To: <1355760092-18755-1-git-send-email-imammedo@redhat.com> References: <1355760092-18755-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Don@CloudSwitch.com, ehabkost@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 11/20] target-i386: do not set vendor_override in x86_cpuid_set_vendor() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org commit d480e1af which introduced vendor property was setting env->cpuid_vendor_override = 1, which prevents using vendor property on its own without triggering vendor override. Fix it by removing setting cpuid_vendor_override in x86_cpuid_set_vendor() to allow to use vendor property in other places that doesn't require cpuid_vendor_override to be set to 1. Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a74d74b..c6c074f 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1163,7 +1163,6 @@ static void x86_cpuid_set_vendor(Object *obj, const char *value, env->cpuid_vendor2 |= ((uint8_t)value[i + 4]) << (8 * i); env->cpuid_vendor3 |= ((uint8_t)value[i + 8]) << (8 * i); } - env->cpuid_vendor_override = 1; } static char *x86_cpuid_get_model_id(Object *obj, Error **errp)