From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkd94-0005ln-8D 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 1Tkd8z-0001tW-2r for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:02:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkd8y-0001sG-PX for qemu-devel@nongnu.org; Mon, 17 Dec 2012 11:02:16 -0500 From: Igor Mammedov Date: Mon, 17 Dec 2012 17:01:16 +0100 Message-Id: <1355760092-18755-5-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 04/20] target-i386: setting default 'vendor' is obsolete, remove it 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 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 --- 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); -- 1.7.1