On Fri, Sep 07, 2012 at 10:54:54PM +0200, Igor Mammedov wrote: > later it could be used in cpu_x86_find_by_name() to init > CPU from found cpu_def > > Signed-off-by: Igor Mammedov <imamm...@redhat.com> > Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com> (Just confirming that the patch refresh looks OK to me) > -- > v2: > - rebased on top of "i386: cpu: remove duplicate feature names" > http://www.mail-archive.com/qemu-devel@nongnu.org/msg129458.html > --- > target-i386/cpu.c | 84 > +++++++++++++++++++++++++++++-------------------------- > 1 file changed, 44 insertions(+), 40 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 567ad69..ff8c78e 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1086,6 +1086,49 @@ static void x86_cpuid_set_tsc_freq(Object *obj, > Visitor *v, void *opaque, > cpu->env.tsc_khz = value / 1000; > } > > +static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) > +{ > + CPUX86State *env = &cpu->env; > + > + 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; > + } > + env->cpuid_vendor_override = def->vendor_override; > + object_property_set_int(OBJECT(cpu), def->level, "level", errp); > + object_property_set_int(OBJECT(cpu), def->family, "family", errp); > + object_property_set_int(OBJECT(cpu), def->model, "model", errp); > + object_property_set_int(OBJECT(cpu), def->stepping, "stepping", errp); > + object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", errp); > + object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp); > + object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000, > + "tsc-frequency", errp); > + env->cpuid_features = def->features; > + env->cpuid_ext_features = def->ext_features; > + env->cpuid_ext2_features = def->ext2_features; > + env->cpuid_ext3_features = def->ext3_features; > + env->cpuid_kvm_features = def->kvm_features; > + env->cpuid_svm_features = def->svm_features; > + env->cpuid_ext4_features = def->ext4_features; > + env->cpuid_7_0_ebx = def->cpuid_7_0_ebx_features; > + env->cpuid_xlevel2 = def->xlevel2; > + > + /* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on > + * CPUID[1].EDX. > + */ > + if (env->cpuid_vendor1 == CPUID_VENDOR_AMD_1 && > + env->cpuid_vendor2 == CPUID_VENDOR_AMD_2 && > + env->cpuid_vendor3 == CPUID_VENDOR_AMD_3) { > + env->cpuid_ext2_features &= ~CPUID_EXT2_AMD_ALIASES; > + env->cpuid_ext2_features |= (def->features & CPUID_EXT2_AMD_ALIASES); > + } > +} > + > static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, > const char *cpu_model, Error **errp) > { > @@ -1353,7 +1396,6 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error > **errp) > > int cpu_x86_register(X86CPU *cpu, const char *cpu_model) > { > - CPUX86State *env = &cpu->env; > x86_def_t def1, *def = &def1; > Error *error = NULL; > > @@ -1363,45 +1405,7 @@ int cpu_x86_register(X86CPU *cpu, const char > *cpu_model) > goto out; > } > > - 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; > - } > - 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); > - object_property_set_int(OBJECT(cpu), def->model, "model", &error); > - object_property_set_int(OBJECT(cpu), def->stepping, "stepping", &error); > - env->cpuid_features = def->features; > - env->cpuid_ext_features = def->ext_features; > - env->cpuid_ext2_features = def->ext2_features; > - env->cpuid_ext3_features = def->ext3_features; > - object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", &error); > - env->cpuid_kvm_features = def->kvm_features; > - env->cpuid_svm_features = def->svm_features; > - env->cpuid_ext4_features = def->ext4_features; > - env->cpuid_7_0_ebx = def->cpuid_7_0_ebx_features; > - env->cpuid_xlevel2 = def->xlevel2; > - object_property_set_int(OBJECT(cpu), (int64_t)def->tsc_khz * 1000, > - "tsc-frequency", &error); > - > - /* On AMD CPUs, some CPUID[8000_0001].EDX bits must match the bits on > - * CPUID[1].EDX. > - */ > - if (env->cpuid_vendor1 == CPUID_VENDOR_AMD_1 && > - env->cpuid_vendor2 == CPUID_VENDOR_AMD_2 && > - env->cpuid_vendor3 == CPUID_VENDOR_AMD_3) { > - env->cpuid_ext2_features &= ~CPUID_EXT2_AMD_ALIASES; > - env->cpuid_ext2_features |= (def->features & CPUID_EXT2_AMD_ALIASES); > - } > - > - > - object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); > + cpudef_2_x86_cpu(cpu, def, &error); > > out: > if (error_is_set(&error)) { > -- > 1.7.11.4 > > -- Eduardo
