From patchwork Thu Dec 27 14:59:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [04/20] target-i386: setting default 'vendor' is obsolete, remove it X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 208333 Message-Id: <1356620376-23501-5-git-send-email-imammedo@redhat.com> To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, afaerber@suse.de Date: Thu, 27 Dec 2012 15:59:20 +0100 From: Igor Mammedov List-Id: since cpu_def config is not supported anymore and all remaining sources now always set x86_def_t.vendor[123] fields remove setting default vendor to simplify future re-factoring. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost Reviewed-by: Eduardo Habkost --- target-i386/cpu.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 1497980..99fd3f3 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1539,15 +1539,10 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) if (cpu_x86_parse_featurestr(def, features) < 0) { goto error; } - if (def->vendor1) { - env->cpuid_vendor1 = def->vendor1; - env->cpuid_vendor2 = def->vendor2; - env->cpuid_vendor3 = def->vendor3; - } else { - env->cpuid_vendor1 = CPUID_VENDOR_INTEL_1; - env->cpuid_vendor2 = CPUID_VENDOR_INTEL_2; - env->cpuid_vendor3 = CPUID_VENDOR_INTEL_3; - } + assert(def->vendor1); + env->cpuid_vendor1 = def->vendor1; + env->cpuid_vendor2 = def->vendor2; + env->cpuid_vendor3 = def->vendor3; env->cpuid_vendor_override = def->vendor_override; object_property_set_int(OBJECT(cpu), def->level, "level", &error); object_property_set_int(OBJECT(cpu), def->family, "family", &error);