On Thu, Dec 27, 2012 at 03:59:20PM +0100, Igor Mammedov wrote:
> 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 <imamm...@redhat.com>
> Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
To confirm that this specific submission is OK to me:
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> 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
>
--
Eduardo
