From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Igor Mammedov 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> Subject: [Qemu-devel] [PATCH 11/20] target-i386: do not set vendor_override in x86_cpuid_set_vendor() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Don@CloudSwitch.com, ehabkost@redhat.com, afaerber@suse.de 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) -- 1.7.1