From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyJE-0005Ud-2K for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGyJC-0004NH-7C for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGyJB-0004Mz-Vi for qemu-devel@nongnu.org; Wed, 26 Sep 2012 16:34:14 -0400 From: Igor Mammedov Date: Wed, 26 Sep 2012 22:32:51 +0200 Message-Id: <1348691578-17231-16-git-send-email-imammedo@redhat.com> In-Reply-To: <1348691578-17231-1-git-send-email-imammedo@redhat.com> References: <1348691578-17231-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 15/22] target-i386: introduce vendor-override property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@CloudSwitch.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, stefanha@linux.vnet.ibm.com 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 d36410a..4f333e9 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1133,7 +1133,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) @@ -1307,6 +1306,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; @@ -1320,7 +1344,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); @@ -2128,6 +2152,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 4995084..4f525ee 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -774,7 +774,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; -- 1.7.1