From patchwork Sun Dec 9 19:45:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 204777 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 03B5D2C0172 for ; Mon, 10 Dec 2012 06:46:34 +1100 (EST) Received: from localhost ([::1]:46765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Thmpc-0003wX-5B for incoming@patchwork.ozlabs.org; Sun, 09 Dec 2012 14:46:32 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ThmpH-0003jJ-Tm for qemu-devel@nongnu.org; Sun, 09 Dec 2012 14:46:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ThmpG-00054f-BA for qemu-devel@nongnu.org; Sun, 09 Dec 2012 14:46:11 -0500 Received: from cantor2.suse.de ([195.135.220.15]:49240 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ThmpG-00054Z-2d for qemu-devel@nongnu.org; Sun, 09 Dec 2012 14:46:10 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 2ED03A41E0; Sun, 9 Dec 2012 20:46:09 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 9 Dec 2012 20:45:52 +0100 Message-Id: <1355082353-322-4-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355082353-322-1-git-send-email-afaerber@suse.de> References: <1354645978-17362-1-git-send-email-ehabkost@redhat.com> <1355082353-322-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Anthony Liguori , ehabkost@redhat.com, Riku Voipio , blauwirbel@gmail.com, imammedo@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH qom-cpu 3/4] Really finally kill cpudef config section support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Commit 511c68d3af626cb0a39034cb77e7ac64d3a26c0c (finally kill cpudef config section support) removed the cpudef parsing support but left cpudef_* hooks behind. Remove those. Since TYPE_X86_CPU currently is the only CPU class and CPUs are instantiated exclusively through QOM (i.e., cpu_x86_init()), we can use its class_init to bootstrap the list of model definitions until we have these as subclasses. Avoid code movements for x86_cpudef_setup() to not interfere with the various approaches to drop it in favor of subclasses. Signed-off-by: Andreas Färber Cc: Eduardo Habkost Cc: Blue Swirl Reviewed-by: Eduardo Habkost --- arch_init.c | 7 ------- arch_init.h | 1 - bsd-user/main.c | 3 --- linux-user/main.c | 3 --- target-i386/cpu.c | 7 ++++++- target-i386/cpu.h | 2 -- vl.c | 7 ------- 7 Dateien geändert, 6 Zeilen hinzugefügt(+), 24 Zeilen entfernt(-) diff --git a/arch_init.c b/arch_init.c index e6effe8..bea1b9c 100644 --- a/arch_init.c +++ b/arch_init.c @@ -1124,13 +1124,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/arch_init.h b/arch_init.h index 5fc780c..84a7f9a 100644 --- a/arch_init.h +++ b/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/bsd-user/main.c b/bsd-user/main.c index 095ae8e..cf0a345 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/linux-user/main.c b/linux-user/main.c index 25e35cd..e881fcf 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3426,9 +3426,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/target-i386/cpu.c b/target-i386/cpu.c index e265317..13de2e3 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1414,6 +1414,9 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf) int i; char buf[256]; + /* Force creation of CPU class */ + object_class_by_name(TYPE_X86_CPU); + for (i = 0; i < ARRAY_SIZE(builtin_x86_defs); i++) { x86_def_t *def = &builtin_x86_defs[i]; snprintf(buf, sizeof(buf), "%s", def->name); @@ -1585,7 +1588,7 @@ void cpu_clear_apic_feature(CPUX86State *env) /* Initialize list of CPU models, filling some non-static fields if necessary */ -void x86_cpudef_setup(void) +static void x86_cpudef_setup(void) { int i, j; static const char *model_with_versions[] = { "qemu32", "qemu64", "athlon" }; @@ -2138,6 +2141,8 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_reset = cc->reset; cc->reset = x86_cpu_reset; + + x86_cpudef_setup(); } static const TypeInfo x86_cpu_type_info = { diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 386c4f6..bd6aec4 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -865,7 +865,6 @@ typedef struct CPUX86State { X86CPU *cpu_x86_init(const char *cpu_model); int cpu_x86_exec(CPUX86State *s); void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); -void x86_cpudef_setup(void); int cpu_x86_support_mca_broadcast(CPUX86State *env); int cpu_get_pic_interrupt(CPUX86State *s); @@ -1047,7 +1046,6 @@ static inline CPUX86State *cpu_init(const char *cpu_model) #define cpu_gen_code cpu_x86_gen_code #define cpu_signal_handler cpu_x86_signal_handler #define cpu_list x86_cpu_list -#define cpudef_setup x86_cpudef_setup #define CPU_SAVE_VERSION 12 diff --git a/vl.c b/vl.c index a3ab384..9d867c2 100644 --- a/vl.c +++ b/vl.c @@ -3560,13 +3560,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);