Message ID | 1360082364-12475-2-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
Am 05.02.2013 17:39, schrieb Igor Mammedov: > From: Andreas Färber <afaerber@suse.de> > > Consolidate CPU functions in cpu.c. > Allows to make cpu_x86_register() static. > > No functional changes. > > Signed-off-by: Andreas Färber <afaerber@suse.de> Do we agree that this patch is okay? If you add a Reviewed-by I'll add it to qom-cpu-next then (Sob was missing here but it looks unchanged). Andreas
On Tue, Feb 05, 2013 at 05:39:20PM +0100, Igor Mammedov wrote: > From: Andreas Färber <afaerber@suse.de> > > Consolidate CPU functions in cpu.c. > Allows to make cpu_x86_register() static. > > No functional changes. > > Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu.c | 26 +++++++++++++++++++++++++- > target-i386/cpu.h | 1 - > target-i386/helper.c | 24 ------------------------ > 3 files changed, 25 insertions(+), 26 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index ea0ce0b..f16b13e 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1516,7 +1516,7 @@ static void filter_features_for_kvm(X86CPU *cpu) > } > #endif > > -int cpu_x86_register(X86CPU *cpu, const char *cpu_model) > +static int cpu_x86_register(X86CPU *cpu, const char *cpu_model) > { > CPUX86State *env = &cpu->env; > x86_def_t def1, *def = &def1; > @@ -1576,6 +1576,30 @@ out: > return 0; > } > > +X86CPU *cpu_x86_init(const char *cpu_model) > +{ > + X86CPU *cpu; > + CPUX86State *env; > + Error *error = NULL; > + > + cpu = X86_CPU(object_new(TYPE_X86_CPU)); > + env = &cpu->env; > + env->cpu_model_str = cpu_model; > + > + if (cpu_x86_register(cpu, cpu_model) < 0) { > + object_unref(OBJECT(cpu)); > + return NULL; > + } > + > + object_property_set_bool(OBJECT(cpu), true, "realized", &error); > + if (error) { > + error_free(error); > + object_unref(OBJECT(cpu)); > + return NULL; > + } > + return cpu; > +} > + > #if !defined(CONFIG_USER_ONLY) > > void cpu_clear_apic_feature(CPUX86State *env) > diff --git a/target-i386/cpu.h b/target-i386/cpu.h > index 9e6e1a6..7577e4f 100644 > --- a/target-i386/cpu.h > +++ b/target-i386/cpu.h > @@ -1002,7 +1002,6 @@ int cpu_x86_signal_handler(int host_signum, void *pinfo, > void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, > uint32_t *eax, uint32_t *ebx, > uint32_t *ecx, uint32_t *edx); > -int cpu_x86_register(X86CPU *cpu, const char *cpu_model); > void cpu_clear_apic_feature(CPUX86State *env); > void host_cpuid(uint32_t function, uint32_t count, > uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); > diff --git a/target-i386/helper.c b/target-i386/helper.c > index 1a872fa..4bf9db7 100644 > --- a/target-i386/helper.c > +++ b/target-i386/helper.c > @@ -1267,30 +1267,6 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector, > return 1; > } > > -X86CPU *cpu_x86_init(const char *cpu_model) > -{ > - X86CPU *cpu; > - CPUX86State *env; > - Error *error = NULL; > - > - cpu = X86_CPU(object_new(TYPE_X86_CPU)); > - env = &cpu->env; > - env->cpu_model_str = cpu_model; > - > - if (cpu_x86_register(cpu, cpu_model) < 0) { > - object_unref(OBJECT(cpu)); > - return NULL; > - } > - > - object_property_set_bool(OBJECT(cpu), true, "realized", &error); > - if (error) { > - error_free(error); > - object_unref(OBJECT(cpu)); > - return NULL; > - } > - return cpu; > -} > - > #if !defined(CONFIG_USER_ONLY) > void do_cpu_init(X86CPU *cpu) > { > -- > 1.7.1 >
Am 06.02.2013 12:07, schrieb Eduardo Habkost: > On Tue, Feb 05, 2013 at 05:39:20PM +0100, Igor Mammedov wrote: >> From: Andreas Färber <afaerber@suse.de> >> >> Consolidate CPU functions in cpu.c. >> Allows to make cpu_x86_register() static. >> >> No functional changes. >> >> Signed-off-by: Andreas Färber <afaerber@suse.de> > > Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Thanks, cherry-picked the original commit to rebase on: https://github.com/afaerber/qemu-cpu/commits/qom-cpu-next Andreas
On Wed, 06 Feb 2013 11:58:26 +0100 Andreas Färber <afaerber@suse.de> wrote: > Am 05.02.2013 17:39, schrieb Igor Mammedov: > > From: Andreas Färber <afaerber@suse.de> > > > > Consolidate CPU functions in cpu.c. > > Allows to make cpu_x86_register() static. > > > > No functional changes. > > > > Signed-off-by: Andreas Färber <afaerber@suse.de> > > Do we agree that this patch is okay? If you add a Reviewed-by I'll add > it to qom-cpu-next then (Sob was missing here but it looks unchanged). > > Andreas > Sure, Reviewed-By: Igor Mammedov <imammedo@redhat.com>
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index ea0ce0b..f16b13e 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1516,7 +1516,7 @@ static void filter_features_for_kvm(X86CPU *cpu) } #endif -int cpu_x86_register(X86CPU *cpu, const char *cpu_model) +static int cpu_x86_register(X86CPU *cpu, const char *cpu_model) { CPUX86State *env = &cpu->env; x86_def_t def1, *def = &def1; @@ -1576,6 +1576,30 @@ out: return 0; } +X86CPU *cpu_x86_init(const char *cpu_model) +{ + X86CPU *cpu; + CPUX86State *env; + Error *error = NULL; + + cpu = X86_CPU(object_new(TYPE_X86_CPU)); + env = &cpu->env; + env->cpu_model_str = cpu_model; + + if (cpu_x86_register(cpu, cpu_model) < 0) { + object_unref(OBJECT(cpu)); + return NULL; + } + + object_property_set_bool(OBJECT(cpu), true, "realized", &error); + if (error) { + error_free(error); + object_unref(OBJECT(cpu)); + return NULL; + } + return cpu; +} + #if !defined(CONFIG_USER_ONLY) void cpu_clear_apic_feature(CPUX86State *env) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 9e6e1a6..7577e4f 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1002,7 +1002,6 @@ int cpu_x86_signal_handler(int host_signum, void *pinfo, void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); -int cpu_x86_register(X86CPU *cpu, const char *cpu_model); void cpu_clear_apic_feature(CPUX86State *env); void host_cpuid(uint32_t function, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); diff --git a/target-i386/helper.c b/target-i386/helper.c index 1a872fa..4bf9db7 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1267,30 +1267,6 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector, return 1; } -X86CPU *cpu_x86_init(const char *cpu_model) -{ - X86CPU *cpu; - CPUX86State *env; - Error *error = NULL; - - cpu = X86_CPU(object_new(TYPE_X86_CPU)); - env = &cpu->env; - env->cpu_model_str = cpu_model; - - if (cpu_x86_register(cpu, cpu_model) < 0) { - object_unref(OBJECT(cpu)); - return NULL; - } - - object_property_set_bool(OBJECT(cpu), true, "realized", &error); - if (error) { - error_free(error); - object_unref(OBJECT(cpu)); - return NULL; - } - return cpu; -} - #if !defined(CONFIG_USER_ONLY) void do_cpu_init(X86CPU *cpu) {