[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/15] target-i386: Set constant model_id for qemu63/
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 06/15] target-i386: Set constant model_id for qemu63/qemu32/athlon |
Date: |
Mon, 23 May 2016 16:24:18 -0300 |
Newer PC machines don't set hw_version, and older machines set
model-id on compat_props explicitly, so we don't need the
x86_cpudef_setup() code that sets model_id using
qemu_hw_version() anymore.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index e9ef39b..14f64cb 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -710,6 +710,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
.features[FEAT_8000_0001_ECX] =
CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM,
.xlevel = 0x8000000A,
+ .model_id = "QEMU Virtual CPU version " QEMU_HW_VERSION,
},
{
.name = "phenom",
@@ -806,6 +807,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
.features[FEAT_1_ECX] =
CPUID_EXT_SSE3,
.xlevel = 0x80000004,
+ .model_id = "QEMU Virtual CPU version " QEMU_HW_VERSION,
},
{
.name = "kvm32",
@@ -902,6 +904,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
.features[FEAT_8000_0001_EDX] =
CPUID_EXT2_MMXEXT | CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT,
.xlevel = 0x80000008,
+ .model_id = "QEMU Virtual CPU version " QEMU_HW_VERSION,
},
{
.name = "n270",
@@ -2271,28 +2274,8 @@ void cpu_clear_apic_feature(CPUX86State *env)
#endif /* !CONFIG_USER_ONLY */
-/* Initialize list of CPU models, filling some non-static fields if necessary
- */
void x86_cpudef_setup(void)
{
- int i, j;
- static const char *model_with_versions[] = { "qemu32", "qemu64", "athlon"
};
-
- for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); ++i) {
- X86CPUDefinition *def = &builtin_x86_defs[i];
-
- /* Look for specific "cpudef" models that */
- /* have the QEMU version in .model_id */
- for (j = 0; j < ARRAY_SIZE(model_with_versions); j++) {
- if (strcmp(model_with_versions[j], def->name) == 0) {
- pstrcpy(def->model_id, sizeof(def->model_id),
- "QEMU Virtual CPU version ");
- pstrcat(def->model_id, sizeof(def->model_id),
- qemu_hw_version());
- break;
- }
- }
- }
}
void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
--
2.5.5
- [Qemu-devel] [PULL 00/15] X86 queue, 2016-05-23, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 04/15] osdep: Move default qemu_hw_version() value to a macro, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 01/15] target-i386: Define structs for layout of xsave area, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 02/15] target-i386: Use xsave structs for ext_save_area, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 05/15] pc: Set CPU model-id on compat_props for pc <= 2.4, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 03/15] target-i386: kvm: Use X86XSaveArea struct for xsave save/load, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 10/15] target-i386: Call cpu_exec_init() on realize, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 11/15] target-i386: kvm: Allocate kvm_msrs struct once per VCPU, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 06/15] target-i386: Set constant model_id for qemu63/qemu32/athlon,
Eduardo Habkost <=
- [Qemu-devel] [PULL 07/15] cpu: Eliminate cpudef_init(), cpudef_setup(), Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 08/15] target-i386: Move TCG initialization check to tcg_x86_init(), Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 12/15] target-i386: kvm: Increase MSR_BUF_SIZE, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 09/15] target-i386: Move TCG initialization to realize time, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 14/15] target-i386: kvm: Simplify MSR setting functions, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 13/15] target-i386: kvm: Simplify MSR array construction, Eduardo Habkost, 2016/05/23
- [Qemu-devel] [PULL 15/15] target-i386: kvm: Eliminate kvm_msr_entry_set(), Eduardo Habkost, 2016/05/23
- Re: [Qemu-devel] [PULL 00/15] X86 queue, 2016-05-23, Eduardo Habkost, 2016/05/23