[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/20] target-i386: setting default 'vendor' is obso
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 04/20] target-i386: setting default 'vendor' is obsolete, remove it |
Date: |
Mon, 17 Dec 2012 17:01:16 +0100 |
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 <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
---
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
- Re: [Qemu-devel] [PATCH 11/20] target-i386: do not set vendor_override in x86_cpuid_set_vendor(), (continued)
- [Qemu-devel] target-i386: Remove *vendor_override fields from x86_def_t and CPUX86State, Igor Mammedov, 2012/12/19
- [Qemu-devel] [PATCH 11/20] target-i386: add x86cpu_vendor_words2str(), Igor Mammedov, 2012/12/19
- [Qemu-devel] [PATCH 12/20 v2] target-i386: replace uint32_t vendor fields by vendor string in x86_def_t, Igor Mammedov, 2012/12/19
- [Qemu-devel] [PATCH 13/20] target-i386: remove vendor_override field from CPUX86State, Igor Mammedov, 2012/12/19
- Re: [Qemu-devel] [PATCH 13/20] target-i386: remove vendor_override field from CPUX86State, Eduardo Habkost, 2012/12/20
- Re: [Qemu-devel] [PATCH 13/20] target-i386: remove vendor_override field from CPUX86State, Igor Mammedov, 2012/12/20
[Qemu-devel] [PATCH 04/20] target-i386: setting default 'vendor' is obsolete, remove it,
Igor Mammedov <=
[Qemu-devel] [PATCH 12/20] target-i386: replace uint32_t vendor fields by vendor string in x86_def_t, Igor Mammedov, 2012/12/17
[Qemu-devel] [PATCH 18/20] target-i386: set custom 'stepping' without intermediate x86_def_t, Igor Mammedov, 2012/12/17
[Qemu-devel] [PATCH 17/20] target-i386: set custom 'model-id' without intermediate x86_def_t, Igor Mammedov, 2012/12/17
[Qemu-devel] [PATCH 19/20] target-i386: set custom 'model' without intermediate x86_def_t, Igor Mammedov, 2012/12/17
[Qemu-devel] [PATCH 16/20] target-i386: set custom 'level' without intermediate x86_def_t, Igor Mammedov, 2012/12/17
[Qemu-devel] [PATCH 20/20] target-i386: set custom 'family' without intermediate x86_def_t, Igor Mammedov, 2012/12/17
[Qemu-devel] [PATCH 15/20] target-i386: set custom 'xlevel' without intermediate x86_def_t, Igor Mammedov, 2012/12/17
Re: [Qemu-devel] [PATCH 00/20 v2] x86 CPU cleanup (wave 2), Andreas Färber, 2012/12/17