| Message ID | 1355220666-31722-7-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Dec 11, 2012 at 11:11:06AM +0100, Igor Mammedov wrote: > No functional change, a simple code movement to simplify following refactoring. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > v2: > - rebased on top of "i386: cpu: remove duplicate feature names" > http://www.mail-archive.com/qemu-devel@nongnu.org/msg129458.html > v3: > - rebased on top of 1.3-rc0 & splitted cpu_x86_find_by_name() > - AMD's ext2_features filtering are moved into separate patch > --- > target-i386/cpu.c | 53 ++++++++++++++++++++++++++++++----------------------- > 1 files changed, 30 insertions(+), 23 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index e534254..3b9bbfe 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1235,6 +1235,34 @@ 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; > + > + 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", 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); > + 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", errp); > + 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_features = 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", errp); > + object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp); > +} > + > static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name) > { > x86_def_t *def; > @@ -1513,7 +1541,6 @@ static void filter_features_for_kvm(X86CPU *cpu) > > int cpu_x86_register(X86CPU *cpu, const char *cpu_model) > { > - CPUX86State *env = &cpu->env; > x86_def_t def1, *def = &def1; > Error *error = NULL; > char *name, *features; > @@ -1541,29 +1568,9 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) > if (cpu_x86_parse_featurestr(def, features) < 0) { > goto error; > } > - 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); > - 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_features = 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); > > - object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); > + cpudef_2_x86_cpu(cpu, def, &error); > + > if (error) { > fprintf(stderr, "%s\n", error_get_pretty(error)); > error_free(error); > -- > 1.7.1 >
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e534254..3b9bbfe 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1235,6 +1235,34 @@ 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; + + 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", 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); + 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", errp); + 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_features = 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", errp); + object_property_set_str(OBJECT(cpu), def->model_id, "model-id", errp); +} + static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *name) { x86_def_t *def; @@ -1513,7 +1541,6 @@ static void filter_features_for_kvm(X86CPU *cpu) int cpu_x86_register(X86CPU *cpu, const char *cpu_model) { - CPUX86State *env = &cpu->env; x86_def_t def1, *def = &def1; Error *error = NULL; char *name, *features; @@ -1541,29 +1568,9 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model) if (cpu_x86_parse_featurestr(def, features) < 0) { goto error; } - 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); - 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_features = 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); - object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error); + cpudef_2_x86_cpu(cpu, def, &error); + if (error) { fprintf(stderr, "%s\n", error_get_pretty(error)); error_free(error);
No functional change, a simple code movement to simplify following refactoring. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- v2: - rebased on top of "i386: cpu: remove duplicate feature names" http://www.mail-archive.com/qemu-devel@nongnu.org/msg129458.html v3: - rebased on top of 1.3-rc0 & splitted cpu_x86_find_by_name() - AMD's ext2_features filtering are moved into separate patch --- target-i386/cpu.c | 53 ++++++++++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 23 deletions(-)