Message ID | 1360082364-12475-5-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
On Tue, Feb 05, 2013 at 05:39:23PM +0100, Igor Mammedov wrote: > From: Andreas Färber <afaerber@suse.de> > > QOM (and KVM) infrastructure have obsoleted x86_cpudef_setup(). > Drop the conditional callers that are now unused. > > Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > arch_init.c | 7 ------- > bsd-user/main.c | 3 --- > include/sysemu/arch_init.h | 1 - > linux-user/main.c | 3 --- > vl.c | 7 ------- > 5 files changed, 0 insertions(+), 21 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index 8da868b..2495f2c 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -1119,13 +1119,6 @@ void do_smbios_option(const char *optarg) > #endif > } > > -void cpudef_init(void) > -{ > -#if defined(cpudef_setup) > - cpudef_setup(); /* parse cpu definitions in target config file */ > -#endif > -} > - > int audio_available(void) > { > #ifdef HAS_AUDIO > diff --git a/bsd-user/main.c b/bsd-user/main.c > index ae24723..1084db6 100644 > --- a/bsd-user/main.c > +++ b/bsd-user/main.c > @@ -762,9 +762,6 @@ int main(int argc, char **argv) > } > > cpu_model = NULL; > -#if defined(cpudef_setup) > - cpudef_setup(); /* parse cpu definitions in target config file (TBD) */ > -#endif > > optind = 1; > for(;;) { > diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h > index 5fc780c..84a7f9a 100644 > --- a/include/sysemu/arch_init.h > +++ b/include/sysemu/arch_init.h > @@ -27,7 +27,6 @@ extern const uint32_t arch_type; > void select_soundhw(const char *optarg); > void do_acpitable_option(const char *optarg); > void do_smbios_option(const char *optarg); > -void cpudef_init(void); > int audio_available(void); > void audio_init(ISABus *isa_bus, PCIBus *pci_bus); > int tcg_available(void); > diff --git a/linux-user/main.c b/linux-user/main.c > index 3df8aa2..d98802e 100644 > --- a/linux-user/main.c > +++ b/linux-user/main.c > @@ -3475,9 +3475,6 @@ int main(int argc, char **argv, char **envp) > } > > cpu_model = NULL; > -#if defined(cpudef_setup) > - cpudef_setup(); /* parse cpu definitions in target config file (TBD) */ > -#endif > > /* init debug */ > cpu_set_log_filename(log_file); > diff --git a/vl.c b/vl.c > index 3155989..bc22d8e 100644 > --- a/vl.c > +++ b/vl.c > @@ -3799,13 +3799,6 @@ int main(int argc, char **argv, char **envp) > exit(1); > } > > - /* Init CPU def lists, based on config > - * - Must be called after all the qemu_read_config_file() calls > - * - Must be called before list_cpus() > - * - Must be called before machine->init() > - */ > - cpudef_init(); > - > if (cpu_model && is_help_option(cpu_model)) { > list_cpus(stdout, &fprintf, cpu_model); > exit(0); > -- > 1.7.1 >
diff --git a/arch_init.c b/arch_init.c index 8da868b..2495f2c 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1119,13 +1119,6 @@ void do_smbios_option(const char *optarg) #endif } -void cpudef_init(void) -{ -#if defined(cpudef_setup) - cpudef_setup(); /* parse cpu definitions in target config file */ -#endif -} - int audio_available(void) { #ifdef HAS_AUDIO diff --git a/bsd-user/main.c b/bsd-user/main.c index ae24723..1084db6 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -762,9 +762,6 @@ int main(int argc, char **argv) } cpu_model = NULL; -#if defined(cpudef_setup) - cpudef_setup(); /* parse cpu definitions in target config file (TBD) */ -#endif optind = 1; for(;;) { diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index 5fc780c..84a7f9a 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -27,7 +27,6 @@ extern const uint32_t arch_type; void select_soundhw(const char *optarg); void do_acpitable_option(const char *optarg); void do_smbios_option(const char *optarg); -void cpudef_init(void); int audio_available(void); void audio_init(ISABus *isa_bus, PCIBus *pci_bus); int tcg_available(void); diff --git a/linux-user/main.c b/linux-user/main.c index 3df8aa2..d98802e 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3475,9 +3475,6 @@ int main(int argc, char **argv, char **envp) } cpu_model = NULL; -#if defined(cpudef_setup) - cpudef_setup(); /* parse cpu definitions in target config file (TBD) */ -#endif /* init debug */ cpu_set_log_filename(log_file); diff --git a/vl.c b/vl.c index 3155989..bc22d8e 100644 --- a/vl.c +++ b/vl.c @@ -3799,13 +3799,6 @@ int main(int argc, char **argv, char **envp) exit(1); } - /* Init CPU def lists, based on config - * - Must be called after all the qemu_read_config_file() calls - * - Must be called before list_cpus() - * - Must be called before machine->init() - */ - cpudef_init(); - if (cpu_model && is_help_option(cpu_model)) { list_cpus(stdout, &fprintf, cpu_model); exit(0);