From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkZ-0006iB-BG for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzOkX-0007Wr-6M for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkW-0007We-L1 for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:25 -0400 Date: Mon, 1 Jun 2015 14:23:21 +0200 From: "Michael S. Tsirkin" Message-ID: <1433161230-29421-19-git-send-email-mst@redhat.com> References: <1433161230-29421-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433161230-29421-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 18/60] pc: Define machines using a DEFINE_PC_MACHINE macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Eduardo Habkost , Paolo Bonzini From: Eduardo Habkost This will automatically generate the existing QEMUMachine structs based on the *_MACHINE_OPTIONS macros, and automatically add registration code for them. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/i386/pc.h | 16 +++ hw/i386/pc_piix.c | 270 ++++++++++++--------------------------------------- hw/i386/pc_q35.c | 118 +++++----------------- 3 files changed, 103 insertions(+), 301 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 672f1f7..a5b1fb0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -525,4 +525,20 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .hot_add_cpu = pc_hot_add_cpu, \ .max_cpus = 255 +#define DEFINE_PC_MACHINE(suffix, namestr, initfn, OPTS, COMPAT) \ + static QEMUMachine pc_machine_##suffix = { \ + OPTS, \ + .name = namestr, \ + .init = initfn, \ + .compat_props = (GlobalProperty[]) { \ + COMPAT \ + { /* end of list */ } \ + }, \ + }; \ + static void pc_machine_init_##suffix(void) \ + { \ + qemu_register_pc_machine(&pc_machine_##suffix); \ + } \ + machine_init(pc_machine_init_##suffix) + #endif diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0bbe979..3c5061f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -530,121 +530,70 @@ static void pc_xen_hvm_init(MachineState *machine) .alias = "pc", \ .is_default = 1 +DEFINE_PC_MACHINE(v2_4, "pc-i440fx-2.4", pc_init_pci, + PC_I440FX_2_4_MACHINE_OPTIONS, /* no compat */) -static QEMUMachine pc_i440fx_machine_v2_4 = { - PC_I440FX_2_4_MACHINE_OPTIONS, - .name = "pc-i440fx-2.4", - .init = pc_init_pci, -}; #define PC_I440FX_2_3_MACHINE_OPTIONS \ PC_I440FX_2_4_MACHINE_OPTIONS, \ .alias = NULL, \ .is_default = 0 -static QEMUMachine pc_i440fx_machine_v2_3 = { - PC_I440FX_2_3_MACHINE_OPTIONS, - .name = "pc-i440fx-2.3", - .init = pc_init_pci_2_3, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_2_3 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v2_3, "pc-i440fx-2.3", pc_init_pci_2_3, + PC_I440FX_2_3_MACHINE_OPTIONS, PC_COMPAT_2_3); + #define PC_I440FX_2_2_MACHINE_OPTIONS \ PC_I440FX_2_3_MACHINE_OPTIONS -static QEMUMachine pc_i440fx_machine_v2_2 = { - PC_I440FX_2_2_MACHINE_OPTIONS, - .name = "pc-i440fx-2.2", - .init = pc_init_pci_2_2, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_2_2 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v2_2, "pc-i440fx-2.2", pc_init_pci_2_2, + PC_I440FX_2_2_MACHINE_OPTIONS, PC_COMPAT_2_2); + #define PC_I440FX_2_1_MACHINE_OPTIONS \ PC_I440FX_2_2_MACHINE_OPTIONS, \ .default_display = NULL -static QEMUMachine pc_i440fx_machine_v2_1 = { - PC_I440FX_2_1_MACHINE_OPTIONS, - .name = "pc-i440fx-2.1", - .init = pc_init_pci_2_1, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_2_1 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v2_1, "pc-i440fx-2.1", pc_init_pci_2_1, + PC_I440FX_2_1_MACHINE_OPTIONS, PC_COMPAT_2_1); + #define PC_I440FX_2_0_MACHINE_OPTIONS \ PC_I440FX_2_1_MACHINE_OPTIONS -static QEMUMachine pc_i440fx_machine_v2_0 = { - PC_I440FX_2_0_MACHINE_OPTIONS, - .name = "pc-i440fx-2.0", - .init = pc_init_pci_2_0, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_2_0 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v2_0, "pc-i440fx-2.0", pc_init_pci_2_0, + PC_I440FX_2_0_MACHINE_OPTIONS, PC_COMPAT_2_0); + #define PC_I440FX_1_7_MACHINE_OPTIONS \ PC_I440FX_2_0_MACHINE_OPTIONS, \ .default_machine_opts = NULL -static QEMUMachine pc_i440fx_machine_v1_7 = { - PC_I440FX_1_7_MACHINE_OPTIONS, - .name = "pc-i440fx-1.7", - .init = pc_init_pci_1_7, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_7 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_7, "pc-i440fx-1.7", pc_init_pci_1_7, + PC_I440FX_1_7_MACHINE_OPTIONS, PC_COMPAT_1_7); + #define PC_I440FX_1_6_MACHINE_OPTIONS \ PC_I440FX_1_7_MACHINE_OPTIONS -static QEMUMachine pc_i440fx_machine_v1_6 = { - PC_I440FX_1_6_MACHINE_OPTIONS, - .name = "pc-i440fx-1.6", - .init = pc_init_pci_1_6, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_6 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_6, "pc-i440fx-1.6", pc_init_pci_1_6, + PC_I440FX_1_6_MACHINE_OPTIONS, PC_COMPAT_1_6); + #define PC_I440FX_1_5_MACHINE_OPTIONS \ PC_I440FX_1_6_MACHINE_OPTIONS -static QEMUMachine pc_i440fx_machine_v1_5 = { - PC_I440FX_1_5_MACHINE_OPTIONS, - .name = "pc-i440fx-1.5", - .init = pc_init_pci_1_5, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_5 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_5, "pc-i440fx-1.5", pc_init_pci_1_5, + PC_I440FX_1_5_MACHINE_OPTIONS, PC_COMPAT_1_5); + #define PC_I440FX_1_4_MACHINE_OPTIONS \ PC_I440FX_1_5_MACHINE_OPTIONS, \ .hot_add_cpu = NULL -static QEMUMachine pc_i440fx_machine_v1_4 = { - PC_I440FX_1_4_MACHINE_OPTIONS, - .name = "pc-i440fx-1.4", - .init = pc_init_pci_1_4, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_4 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_4, "pc-i440fx-1.4", pc_init_pci_1_4, + PC_I440FX_1_4_MACHINE_OPTIONS, PC_COMPAT_1_4); + #define PC_COMPAT_1_3 \ PC_COMPAT_1_4 \ @@ -669,15 +618,9 @@ static QEMUMachine pc_i440fx_machine_v1_4 = { #define PC_I440FX_1_3_MACHINE_OPTIONS \ PC_I440FX_1_4_MACHINE_OPTIONS -static QEMUMachine pc_machine_v1_3 = { - PC_I440FX_1_3_MACHINE_OPTIONS, - .name = "pc-1.3", - .init = pc_init_pci_1_3, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_3 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_3, "pc-1.3", pc_init_pci_1_3, + PC_I440FX_1_3_MACHINE_OPTIONS, PC_COMPAT_1_3); + #define PC_COMPAT_1_2 \ PC_COMPAT_1_3 \ @@ -710,15 +653,9 @@ static QEMUMachine pc_machine_v1_3 = { #define PC_I440FX_1_2_MACHINE_OPTIONS \ PC_I440FX_1_3_MACHINE_OPTIONS -static QEMUMachine pc_machine_v1_2 = { - PC_I440FX_1_2_MACHINE_OPTIONS, - .name = "pc-1.2", - .init = pc_init_pci_1_2, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_2 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_2, "pc-1.2", pc_init_pci_1_2, + PC_I440FX_1_2_MACHINE_OPTIONS, PC_COMPAT_1_2); + #define PC_COMPAT_1_1 \ PC_COMPAT_1_2 \ @@ -755,15 +692,9 @@ static QEMUMachine pc_machine_v1_2 = { #define PC_I440FX_1_1_MACHINE_OPTIONS \ PC_I440FX_1_2_MACHINE_OPTIONS -static QEMUMachine pc_machine_v1_1 = { - PC_I440FX_1_1_MACHINE_OPTIONS, - .name = "pc-1.1", - .init = pc_init_pci_1_2, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_1 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_1, "pc-1.1", pc_init_pci_1_2, + PC_I440FX_1_1_MACHINE_OPTIONS, PC_COMPAT_1_1); + #define PC_COMPAT_1_0 \ PC_COMPAT_1_1 \ @@ -789,15 +720,9 @@ static QEMUMachine pc_machine_v1_1 = { PC_I440FX_1_1_MACHINE_OPTIONS, \ .hw_version = "1.0" -static QEMUMachine pc_machine_v1_0 = { - PC_I440FX_1_0_MACHINE_OPTIONS, - .name = "pc-1.0", - .init = pc_init_pci_1_2, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_0 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_0, "pc-1.0", pc_init_pci_1_2, + PC_I440FX_1_0_MACHINE_OPTIONS, PC_COMPAT_1_0); + #define PC_COMPAT_0_15 \ PC_COMPAT_1_0 @@ -806,15 +731,9 @@ static QEMUMachine pc_machine_v1_0 = { PC_I440FX_1_0_MACHINE_OPTIONS, \ .hw_version = "0.15" -static QEMUMachine pc_machine_v0_15 = { - PC_I440FX_0_15_MACHINE_OPTIONS, - .name = "pc-0.15", - .init = pc_init_pci_1_2, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_0_15 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v0_15, "pc-0.15", pc_init_pci_1_2, + PC_I440FX_0_15_MACHINE_OPTIONS, PC_COMPAT_0_15); + #define PC_COMPAT_0_14 \ PC_COMPAT_0_15 \ @@ -848,15 +767,9 @@ static QEMUMachine pc_machine_v0_15 = { PC_I440FX_0_15_MACHINE_OPTIONS, \ .hw_version = "0.14" -static QEMUMachine pc_machine_v0_14 = { - PC_I440FX_0_14_MACHINE_OPTIONS, - .name = "pc-0.14", - .init = pc_init_pci_1_2, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_0_14 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v0_14, "pc-0.14", pc_init_pci_1_2, + PC_I440FX_0_14_MACHINE_OPTIONS, PC_COMPAT_0_14); + #define PC_COMPAT_0_13 \ PC_COMPAT_0_14 \ @@ -886,15 +799,9 @@ static QEMUMachine pc_machine_v0_14 = { PC_I440FX_0_14_MACHINE_OPTIONS, \ .hw_version = "0.13" -static QEMUMachine pc_machine_v0_13 = { - PC_I440FX_0_13_MACHINE_OPTIONS, - .name = "pc-0.13", - .init = pc_init_pci_no_kvmclock, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_0_13 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v0_13, "pc-0.13", pc_init_pci_no_kvmclock, + PC_I440FX_0_13_MACHINE_OPTIONS, PC_COMPAT_0_13); + #define PC_COMPAT_0_12 \ PC_COMPAT_0_13 \ @@ -924,15 +831,9 @@ static QEMUMachine pc_machine_v0_13 = { PC_I440FX_0_13_MACHINE_OPTIONS, \ .hw_version = "0.12" -static QEMUMachine pc_machine_v0_12 = { - PC_I440FX_0_12_MACHINE_OPTIONS, - .name = "pc-0.12", - .init = pc_init_pci_no_kvmclock, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_0_12 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v0_12, "pc-0.12", pc_init_pci_no_kvmclock, + PC_I440FX_0_12_MACHINE_OPTIONS, PC_COMPAT_0_12); + #define PC_COMPAT_0_11 \ PC_COMPAT_0_12 \ @@ -958,15 +859,9 @@ static QEMUMachine pc_machine_v0_12 = { PC_I440FX_0_12_MACHINE_OPTIONS, \ .hw_version = "0.11" -static QEMUMachine pc_machine_v0_11 = { - PC_I440FX_0_11_MACHINE_OPTIONS, - .name = "pc-0.11", - .init = pc_init_pci_no_kvmclock, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_0_11 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v0_11, "pc-0.11", pc_init_pci_no_kvmclock, + PC_I440FX_0_11_MACHINE_OPTIONS, PC_COMPAT_0_11); + #define PC_COMPAT_0_10 \ PC_COMPAT_0_11 \ @@ -996,29 +891,18 @@ static QEMUMachine pc_machine_v0_11 = { PC_I440FX_0_11_MACHINE_OPTIONS, \ .hw_version = "0.10" -static QEMUMachine pc_machine_v0_10 = { - PC_I440FX_0_10_MACHINE_OPTIONS, - .name = "pc-0.10", - .init = pc_init_pci_no_kvmclock, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_0_10 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v0_10, "pc-0.10", pc_init_pci_no_kvmclock, + PC_I440FX_0_10_MACHINE_OPTIONS, PC_COMPAT_0_10); + #define ISAPC_MACHINE_OPTIONS \ PC_COMMON_MACHINE_OPTIONS, \ .desc = "ISA-only PC", \ .max_cpus = 1 -static QEMUMachine isapc_machine = { - ISAPC_MACHINE_OPTIONS, - .name = "isapc", - .init = pc_init_isa, - .compat_props = (GlobalProperty[]) { - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa, + ISAPC_MACHINE_OPTIONS, /* no compat */); + #ifdef CONFIG_XEN #define XENFV_MACHINE_OPTIONS \ @@ -1028,38 +912,6 @@ static QEMUMachine isapc_machine = { .default_machine_opts = "accel=xen", \ .hot_add_cpu = pc_hot_add_cpu -static QEMUMachine xenfv_machine = { - XENFV_MACHINE_OPTIONS, - .name = "xenfv", - .init = pc_xen_hvm_init, -}; +DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init, + XENFV_MACHINE_OPTIONS, /* no compat */); #endif - -static void pc_machine_init(void) -{ - qemu_register_pc_machine(&pc_i440fx_machine_v2_4); - qemu_register_pc_machine(&pc_i440fx_machine_v2_3); - qemu_register_pc_machine(&pc_i440fx_machine_v2_2); - qemu_register_pc_machine(&pc_i440fx_machine_v2_1); - qemu_register_pc_machine(&pc_i440fx_machine_v2_0); - qemu_register_pc_machine(&pc_i440fx_machine_v1_7); - qemu_register_pc_machine(&pc_i440fx_machine_v1_6); - qemu_register_pc_machine(&pc_i440fx_machine_v1_5); - qemu_register_pc_machine(&pc_i440fx_machine_v1_4); - qemu_register_pc_machine(&pc_machine_v1_3); - qemu_register_pc_machine(&pc_machine_v1_2); - qemu_register_pc_machine(&pc_machine_v1_1); - qemu_register_pc_machine(&pc_machine_v1_0); - qemu_register_pc_machine(&pc_machine_v0_15); - qemu_register_pc_machine(&pc_machine_v0_14); - qemu_register_pc_machine(&pc_machine_v0_13); - qemu_register_pc_machine(&pc_machine_v0_12); - qemu_register_pc_machine(&pc_machine_v0_11); - qemu_register_pc_machine(&pc_machine_v0_10); - qemu_register_pc_machine(&isapc_machine); -#ifdef CONFIG_XEN - qemu_register_pc_machine(&xenfv_machine); -#endif -} - -machine_init(pc_machine_init); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 196178e..54447d0 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -427,131 +427,65 @@ static void pc_q35_init_1_4(MachineState *machine) .default_display = "std", \ .alias = "q35" -static QEMUMachine pc_q35_machine_v2_4 = { - PC_Q35_2_4_MACHINE_OPTIONS, - .name = "pc-q35-2.4", - .init = pc_q35_init, -}; +DEFINE_PC_MACHINE(v2_4, "pc-q35-2.4", pc_q35_init, + PC_Q35_2_4_MACHINE_OPTIONS, /* no compat */); + #define PC_Q35_2_3_MACHINE_OPTIONS \ PC_Q35_2_4_MACHINE_OPTIONS, \ .alias = NULL -static QEMUMachine pc_q35_machine_v2_3 = { - PC_Q35_2_3_MACHINE_OPTIONS, - .name = "pc-q35-2.3", - .init = pc_q35_init_2_3, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_2_3 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v2_3, "pc-q35-2.3", pc_q35_init_2_3, + PC_Q35_2_3_MACHINE_OPTIONS, PC_COMPAT_2_3); + #define PC_Q35_2_2_MACHINE_OPTIONS \ PC_Q35_2_3_MACHINE_OPTIONS -static QEMUMachine pc_q35_machine_v2_2 = { - PC_Q35_2_2_MACHINE_OPTIONS, - .name = "pc-q35-2.2", - .init = pc_q35_init_2_2, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_2_2 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v2_2, "pc-q35-2.2", pc_q35_init_2_2, + PC_Q35_2_2_MACHINE_OPTIONS, PC_COMPAT_2_2); + #define PC_Q35_2_1_MACHINE_OPTIONS \ PC_Q35_2_2_MACHINE_OPTIONS, \ .default_display = NULL -static QEMUMachine pc_q35_machine_v2_1 = { - PC_Q35_2_1_MACHINE_OPTIONS, - .name = "pc-q35-2.1", - .init = pc_q35_init_2_1, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_2_1 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v2_1, "pc-q35-2.1", pc_q35_init_2_1, + PC_Q35_2_1_MACHINE_OPTIONS, PC_COMPAT_2_1); + #define PC_Q35_2_0_MACHINE_OPTIONS \ PC_Q35_2_1_MACHINE_OPTIONS -static QEMUMachine pc_q35_machine_v2_0 = { - PC_Q35_2_0_MACHINE_OPTIONS, - .name = "pc-q35-2.0", - .init = pc_q35_init_2_0, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_2_0 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v2_0, "pc-q35-2.0", pc_q35_init_2_0, + PC_Q35_2_0_MACHINE_OPTIONS, PC_COMPAT_2_0); + #define PC_Q35_1_7_MACHINE_OPTIONS \ PC_Q35_2_0_MACHINE_OPTIONS, \ .default_machine_opts = NULL -static QEMUMachine pc_q35_machine_v1_7 = { - PC_Q35_1_7_MACHINE_OPTIONS, - .name = "pc-q35-1.7", - .init = pc_q35_init_1_7, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_7 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_7, "pc-q35-1.7", pc_q35_init_1_7, + PC_Q35_1_7_MACHINE_OPTIONS, PC_COMPAT_1_7); + #define PC_Q35_1_6_MACHINE_OPTIONS \ PC_Q35_MACHINE_OPTIONS -static QEMUMachine pc_q35_machine_v1_6 = { - PC_Q35_1_6_MACHINE_OPTIONS, - .name = "pc-q35-1.6", - .init = pc_q35_init_1_6, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_6 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_6, "pc-q35-1.6", pc_q35_init_1_6, + PC_Q35_1_6_MACHINE_OPTIONS, PC_COMPAT_1_6); + #define PC_Q35_1_5_MACHINE_OPTIONS \ PC_Q35_1_6_MACHINE_OPTIONS -static QEMUMachine pc_q35_machine_v1_5 = { - PC_Q35_1_5_MACHINE_OPTIONS, - .name = "pc-q35-1.5", - .init = pc_q35_init_1_5, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_5 - { /* end of list */ } - }, -}; +DEFINE_PC_MACHINE(v1_5, "pc-q35-1.5", pc_q35_init_1_5, + PC_Q35_1_5_MACHINE_OPTIONS, PC_COMPAT_1_5); + #define PC_Q35_1_4_MACHINE_OPTIONS \ PC_Q35_1_5_MACHINE_OPTIONS, \ .hot_add_cpu = NULL -static QEMUMachine pc_q35_machine_v1_4 = { - PC_Q35_1_4_MACHINE_OPTIONS, - .name = "pc-q35-1.4", - .init = pc_q35_init_1_4, - .compat_props = (GlobalProperty[]) { - PC_COMPAT_1_4 - { /* end of list */ } - }, -}; - -static void pc_q35_machine_init(void) -{ - qemu_register_pc_machine(&pc_q35_machine_v2_4); - qemu_register_pc_machine(&pc_q35_machine_v2_3); - qemu_register_pc_machine(&pc_q35_machine_v2_2); - qemu_register_pc_machine(&pc_q35_machine_v2_1); - qemu_register_pc_machine(&pc_q35_machine_v2_0); - qemu_register_pc_machine(&pc_q35_machine_v1_7); - qemu_register_pc_machine(&pc_q35_machine_v1_6); - qemu_register_pc_machine(&pc_q35_machine_v1_5); - qemu_register_pc_machine(&pc_q35_machine_v1_4); -} - -machine_init(pc_q35_machine_init); +DEFINE_PC_MACHINE(v1_4, "pc-q35-1.4", pc_q35_init_1_4, + PC_Q35_1_4_MACHINE_OPTIONS, PC_COMPAT_1_4); -- MST