From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1R7S-0001AM-EO for qemu-devel@nongnu.org; Fri, 01 Feb 2013 19:38:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1R7R-0007sX-86 for qemu-devel@nongnu.org; Fri, 01 Feb 2013 19:38:10 -0500 Received: from cantor2.suse.de ([195.135.220.15]:51159 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1R7Q-0007VP-Vd for qemu-devel@nongnu.org; Fri, 01 Feb 2013 19:38:09 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 2 Feb 2013 01:37:08 +0100 Message-Id: <1359765428-27805-5-git-send-email-afaerber@suse.de> In-Reply-To: <1359765428-27805-1-git-send-email-afaerber@suse.de> References: <1359765428-27805-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-cpu-next v3 4/4] Remove cpudef_setup() hooks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , ehabkost@redhat.com, Riku Voipio , blauwirbel@gmail.com, anthony@codemonkey.ws, imammedo@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= QOM (and KVM) infrastructure have obsoleted x86_cpudef_setup(). Drop the conditional callers that are now unused. Signed-off-by: Andreas F=C3=A4rber --- arch_init.c | 7 ------- bsd-user/main.c | 3 --- include/sysemu/arch_init.h | 1 - linux-user/main.c | 3 --- vl.c | 7 ------- 5 Dateien ge=C3=A4ndert, 21 Zeilen entfernt(-) 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 } =20 -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) } =20 cpu_model =3D NULL; -#if defined(cpudef_setup) - cpudef_setup(); /* parse cpu definitions in target config file (TBD)= */ -#endif =20 optind =3D 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) } =20 cpu_model =3D NULL; -#if defined(cpudef_setup) - cpudef_setup(); /* parse cpu definitions in target config file (TBD)= */ -#endif =20 /* init debug */ cpu_set_log_filename(log_file); diff --git a/vl.c b/vl.c index f094f04..2e75c9a 100644 --- a/vl.c +++ b/vl.c @@ -3798,13 +3798,6 @@ int main(int argc, char **argv, char **envp) exit(1); } =20 - /* 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); --=20 1.7.10.4