From patchwork Tue Oct 2 15:37:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 188567 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 C2C422C00A7 for ; Wed, 3 Oct 2012 02:19:00 +1000 (EST) Received: from localhost ([::1]:41644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ4Z2-0001SF-EC for incoming@patchwork.ozlabs.org; Tue, 02 Oct 2012 11:39:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ4Yl-0000sD-GR for qemu-devel@nongnu.org; Tue, 02 Oct 2012 11:39:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJ4Yg-0000Wm-7S for qemu-devel@nongnu.org; Tue, 02 Oct 2012 11:38:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJ4Yf-0000We-Uz for qemu-devel@nongnu.org; Tue, 02 Oct 2012 11:38:54 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q92FcEhl008992 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 2 Oct 2012 11:38:15 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q92FbKI2021344; Tue, 2 Oct 2012 11:38:11 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 2 Oct 2012 17:37:07 +0200 Message-Id: <1349192235-31895-16-git-send-email-imammedo@redhat.com> In-Reply-To: <1349192235-31895-1-git-send-email-imammedo@redhat.com> References: <1349192235-31895-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, hpa@linux.intel.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@cloudswitch.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, akong@redhat.com, lersek@redhat.com, afaerber@suse.de, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 15/23] target-i386: introduce vendor-override property 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 currently 'cpuid_vendor_override' can be set only via cmd line cpu_model string. But setting it in 'vendor' property prevents using 'vendor' property on its own without setting cpuid_vendor_override. So fix/remove enabling cpuid_vendor_override from "vendor" property setter. It's up-to cpu_model string parser to maintain legacy behavior when user overrides vendor on command line. v2: - convert cpuid_vendor_override to bool to reflect its real usage Signed-off-by: Igor Mammedov --- target-i386/cpu.c | 31 +++++++++++++++++++++++++++++-- target-i386/cpu.h | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 7bb6caa..04497f1 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1141,7 +1141,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) @@ -1315,6 +1314,31 @@ static void x86_cpuid_set_enforce(Object *obj, Visitor *v, void *opaque, object_property_set_bool(obj, value, "check", errp); } +static void +x86_cpuid_get_vendor_override(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; + + visit_type_bool(v, &env->cpuid_vendor_override, name, errp); +} + +static void +x86_cpuid_set_vendor_override(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + CPUX86State *env = &cpu->env; + bool value; + + visit_type_bool(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + env->cpuid_vendor_override = value; +} + static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) { CPUX86State *env = &cpu->env; @@ -1328,7 +1352,7 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) env->cpuid_vendor2 = CPUID_VENDOR_INTEL_2; env->cpuid_vendor3 = CPUID_VENDOR_INTEL_3; } - env->cpuid_vendor_override = def->vendor_override; + object_property_set_bool(OBJECT(cpu), true, "vendor-override", errp); object_property_set_int(OBJECT(cpu), def->level, "level", errp); object_property_set_int(OBJECT(cpu), def->family, "family", errp); object_property_set_int(OBJECT(cpu), def->model, "model", errp); @@ -2143,6 +2167,9 @@ static void x86_cpu_initfn(Object *obj) object_property_add_str(obj, "vendor", x86_cpuid_get_vendor, x86_cpuid_set_vendor, NULL); + object_property_add(obj, "vendor-override", "bool", + x86_cpuid_get_vendor_override, + x86_cpuid_set_vendor_override, NULL, NULL, NULL); object_property_add_str(obj, "model-id", x86_cpuid_get_model_id, x86_cpuid_set_model_id, NULL); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index e4a7d5b..f99a735 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -788,7 +788,7 @@ typedef struct CPUX86State { uint32_t cpuid_ext2_features; uint32_t cpuid_ext3_features; uint32_t cpuid_apic_id; - int cpuid_vendor_override; + bool cpuid_vendor_override; /* Store the results of Centaur's CPUID instructions */ uint32_t cpuid_xlevel2; uint32_t cpuid_ext4_features;