[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] target-i386: setting default 'vendor' is obsole
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 4/6] target-i386: setting default 'vendor' is obsolete, remove it |
Date: |
Tue, 11 Dec 2012 11:11:04 +0100 |
since cpu_def config is not supported anymore and all remainig sources now
always set x86_def_t.vendor[123] fields remove setting default vendor to
simplify future refactoring.
Signed-off-by: Igor Mammedov <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
- [Qemu-devel] [PATCH 0/6] x86 CPU cleanup (wave 2), Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 3/6] target-i386: explicitly set vendor for each built-in cpudef, Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 1/6] target-i386: filter out not TCG features if running without kvm at realize time, Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 4/6] target-i386: setting default 'vendor' is obsolete, remove it,
Igor Mammedov <=
- [Qemu-devel] [PATCH 6/6] target-i386: move out CPU features initialization in separate func, Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 5/6] target-i386: move setting defaults out of cpu_x86_parse_featurestr(), Igor Mammedov, 2012/12/11
- [Qemu-devel] [PATCH 2/6] target-i386: sanitize AMD's ext2_features at realize time, Igor Mammedov, 2012/12/11