From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMq-00009W-52 for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:44:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdJMk-0006f9-CG for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:56 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 16:43:28 +0200 Message-Id: <1442673810-2679-20-git-send-email-afaerber@suse.de> In-Reply-To: <1442673810-2679-1-git-send-email-afaerber@suse.de> References: <1442673810-2679-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] [PULL 19/21] Use DEFINE_MACHINE() to register all machines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Evgeny Voevodin , Mark Cave-Ayland , Blue Swirl , Max Filippov , "Edgar E. Iglesias" , Guan Xuetao , Rob Herring , Jia Liu , Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Antony Pavlov , Maksim Kozlov , Leon Alrae , Eduardo Habkost , Li Guang , Fabien Chouteau , Alistair Francis , Peter Chubb , Scott Wood , Richard Henderson , Peter Crosthwaite , Igor Mitsyanko , Michael Walle , "open list:e500" , Dmitry Solodkiy , Bastian Koppelmann , Jan Kiszka , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno From: Eduardo Habkost Convert all machines to use DEFINE_MACHINE() instead of QEMUMachine automatically using a script. Signed-off-by: Eduardo Habkost [AF: Style cleanups, convert imx25_pdk machine] Signed-off-by: Andreas F=C3=A4rber --- hw/alpha/dp264.c | 17 ++-- hw/arm/collie.c | 13 +-- hw/arm/cubieboard.c | 14 +-- hw/arm/digic_boards.c | 13 +-- hw/arm/exynos4_boards.c | 28 +++--- hw/arm/gumstix.c | 28 +++--- hw/arm/highbank.c | 32 +++--- hw/arm/imx25_pdk.c | 13 +-- hw/arm/integratorcp.c | 13 +-- hw/arm/kzm.c | 13 +-- hw/arm/mainstone.c | 13 +-- hw/arm/musicpal.c | 13 +-- hw/arm/netduino2.c | 13 +-- hw/arm/nseries.c | 28 +++--- hw/arm/omap_sx1.c | 24 ++--- hw/arm/palm.c | 13 +-- hw/arm/realview.c | 60 ++++++----- hw/arm/spitz.c | 50 +++++----- hw/arm/stellaris.c | 24 ++--- hw/arm/tosa.c | 13 +-- hw/arm/versatilepb.c | 28 +++--- hw/arm/xilinx_zynq.c | 19 ++-- hw/arm/xlnx-ep108.c | 13 +-- hw/arm/z2.c | 13 +-- hw/core/null-machine.c | 16 +-- hw/cris/axis_dev88.c | 15 +-- hw/lm32/lm32_boards.c | 32 +++--- hw/lm32/milkymist.c | 15 +-- hw/m68k/an5206.c | 13 +-- hw/m68k/dummy_m68k.c | 13 +-- hw/m68k/mcf5208.c | 15 +-- hw/microblaze/petalogix_ml605_mmu.c | 15 +-- hw/microblaze/petalogix_s3adsp1800_mmu.c | 15 +-- hw/mips/mips_fulong2e.c | 13 +-- hw/mips/mips_jazz.c | 28 +++--- hw/mips/mips_malta.c | 22 ++-- hw/mips/mips_mipssim.c | 13 +-- hw/mips/mips_r4k.c | 13 +-- hw/moxie/moxiesim.c | 15 +-- hw/openrisc/openrisc_sim.c | 17 ++-- hw/ppc/e500plat.c | 17 ++-- hw/ppc/mac_oldworld.c | 23 ++--- hw/ppc/mpc8544ds.c | 15 +-- hw/ppc/ppc405_boards.c | 26 ++--- hw/ppc/ppc440_bamboo.c | 13 +-- hw/ppc/prep.c | 17 ++-- hw/ppc/virtex_ml507.c | 13 +-- hw/sh4/r2d.c | 13 +-- hw/sh4/shix.c | 15 +-- hw/sparc/leon3.c | 13 +-- hw/sparc/sun4m.c | 166 ++++++++++++++++---------= ------ hw/sparc64/sun4u.c | 58 ++++++----- hw/tricore/tricore_testboard.c | 15 +-- hw/unicore32/puv3.c | 15 +-- hw/xenpv/xen_machine_pv.c | 17 ++-- hw/xtensa/sim.c | 17 ++-- hw/xtensa/xtfpga.c | 58 ++++++----- 57 files changed, 517 insertions(+), 772 deletions(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index f86e7bb..27bdaa1 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -168,17 +168,12 @@ static void clipper_init(MachineState *machine) } } =20 -static QEMUMachine clipper_machine =3D { - .name =3D "clipper", - .desc =3D "Alpha DP264/CLIPPER", - .init =3D clipper_init, - .max_cpus =3D 4, - .is_default =3D 1, -}; - -static void clipper_machine_init(void) +static void clipper_machine_init(MachineClass *mc) { - qemu_register_machine(&clipper_machine); + mc->desc =3D "Alpha DP264/CLIPPER"; + mc->init =3D clipper_init; + mc->max_cpus =3D 4; + mc->is_default =3D 1; } =20 -machine_init(clipper_machine_init); +DEFINE_MACHINE("clipper", clipper_machine_init) diff --git a/hw/arm/collie.c b/hw/arm/collie.c index 6c9b82f..4e6541e 100644 --- a/hw/arm/collie.c +++ b/hw/arm/collie.c @@ -58,15 +58,10 @@ static void collie_init(MachineState *machine) arm_load_kernel(s->cpu, &collie_binfo); } =20 -static QEMUMachine collie_machine =3D { - .name =3D "collie", - .desc =3D "Collie PDA (SA-1110)", - .init =3D collie_init, -}; - -static void collie_machine_init(void) +static void collie_machine_init(MachineClass *mc) { - qemu_register_machine(&collie_machine); + mc->desc =3D "Collie PDA (SA-1110)"; + mc->init =3D collie_init; } =20 -machine_init(collie_machine_init) +DEFINE_MACHINE("collie", collie_machine_init) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index 1582250..bf068cd 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -74,16 +74,10 @@ static void cubieboard_init(MachineState *machine) arm_load_kernel(&s->a10->cpu, &cubieboard_binfo); } =20 -static QEMUMachine cubieboard_machine =3D { - .name =3D "cubieboard", - .desc =3D "cubietech cubieboard", - .init =3D cubieboard_init, -}; - - -static void cubieboard_machine_init(void) +static void cubieboard_machine_init(MachineClass *mc) { - qemu_register_machine(&cubieboard_machine); + mc->desc =3D "cubietech cubieboard"; + mc->init =3D cubieboard_init; } =20 -machine_init(cubieboard_machine_init) +DEFINE_MACHINE("cubieboard", cubieboard_machine_init) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index f8ba9e5..710045a 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -148,15 +148,10 @@ static void canon_a1100_init(MachineState *machine) digic4_board_init(&digic4_board_canon_a1100); } =20 -static QEMUMachine canon_a1100 =3D { - .name =3D "canon-a1100", - .desc =3D "Canon PowerShot A1100 IS", - .init =3D &canon_a1100_init, -}; - -static void digic_register_machines(void) +static void canon_a1100_machine_init(MachineClass *mc) { - qemu_register_machine(&canon_a1100); + mc->desc =3D "Canon PowerShot A1100 IS"; + mc->init =3D &canon_a1100_init; } =20 -machine_init(digic_register_machines) +DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index 35fc7c4..fadf372 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -144,24 +144,20 @@ static void smdkc210_init(MachineState *machine) arm_load_kernel(ARM_CPU(first_cpu), &exynos4_board_binfo); } =20 -static QEMUMachine exynos4_machine_nuri =3D { - .name =3D "nuri", - .desc =3D "Samsung NURI board (Exynos4210)", - .init =3D nuri_init, - .max_cpus =3D EXYNOS4210_NCPUS, -}; +static void exynos4_machine_nuri_machine_init(MachineClass *mc) +{ + mc->desc =3D "Samsung NURI board (Exynos4210)"; + mc->init =3D nuri_init; + mc->max_cpus =3D EXYNOS4210_NCPUS; +} =20 -static QEMUMachine exynos4_machine_smdkc210 =3D { - .name =3D "smdkc210", - .desc =3D "Samsung SMDKC210 board (Exynos4210)", - .init =3D smdkc210_init, - .max_cpus =3D EXYNOS4210_NCPUS, -}; +DEFINE_MACHINE("nuri", exynos4_machine_nuri_machine_init) =20 -static void exynos4_machine_init(void) +static void exynos4_machine_smdkc210_machine_init(MachineClass *mc) { - qemu_register_machine(&exynos4_machine_nuri); - qemu_register_machine(&exynos4_machine_smdkc210); + mc->desc =3D "Samsung SMDKC210 board (Exynos4210)"; + mc->init =3D smdkc210_init; + mc->max_cpus =3D EXYNOS4210_NCPUS; } =20 -machine_init(exynos4_machine_init); +DEFINE_MACHINE("smdkc210", exynos4_machine_smdkc210_machine_init) diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c index 8103278..6dc98c8 100644 --- a/hw/arm/gumstix.c +++ b/hw/arm/gumstix.c @@ -121,22 +121,18 @@ static void verdex_init(MachineState *machine) qdev_get_gpio_in(cpu->gpio, 99)); } =20 -static QEMUMachine connex_machine =3D { - .name =3D "connex", - .desc =3D "Gumstix Connex (PXA255)", - .init =3D connex_init, -}; - -static QEMUMachine verdex_machine =3D { - .name =3D "verdex", - .desc =3D "Gumstix Verdex (PXA270)", - .init =3D verdex_init, -}; - -static void gumstix_machine_init(void) +static void connex_machine_init(MachineClass *mc) { - qemu_register_machine(&connex_machine); - qemu_register_machine(&verdex_machine); + mc->desc =3D "Gumstix Connex (PXA255)"; + mc->init =3D connex_init; } =20 -machine_init(gumstix_machine_init); +DEFINE_MACHINE("connex", connex_machine_init) + +static void verdex_machine_init(MachineClass *mc) +{ + mc->desc =3D "Gumstix Verdex (PXA270)"; + mc->init =3D verdex_init; +} + +DEFINE_MACHINE("verdex", verdex_machine_init) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 960bc39..9b2887e 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -391,26 +391,22 @@ static void midway_init(MachineState *machine) calxeda_init(machine, CALXEDA_MIDWAY); } =20 -static QEMUMachine highbank_machine =3D { - .name =3D "highbank", - .desc =3D "Calxeda Highbank (ECX-1000)", - .init =3D highbank_init, - .block_default_type =3D IF_SCSI, - .max_cpus =3D 4, -}; +static void highbank_machine_init(MachineClass *mc) +{ + mc->desc =3D "Calxeda Highbank (ECX-1000)"; + mc->init =3D highbank_init; + mc->block_default_type =3D IF_SCSI; + mc->max_cpus =3D 4; +} =20 -static QEMUMachine midway_machine =3D { - .name =3D "midway", - .desc =3D "Calxeda Midway (ECX-2000)", - .init =3D midway_init, - .block_default_type =3D IF_SCSI, - .max_cpus =3D 4, -}; +DEFINE_MACHINE("highbank", highbank_machine_init) =20 -static void calxeda_machines_init(void) +static void midway_machine_init(MachineClass *mc) { - qemu_register_machine(&highbank_machine); - qemu_register_machine(&midway_machine); + mc->desc =3D "Calxeda Midway (ECX-2000)"; + mc->init =3D midway_init; + mc->block_default_type =3D IF_SCSI; + mc->max_cpus =3D 4; } =20 -machine_init(calxeda_machines_init); +DEFINE_MACHINE("midway", midway_machine_init) diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index c34667f..4250114 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -145,15 +145,10 @@ static void imx25_pdk_init(MachineState *machine) } } =20 -static QEMUMachine imx25_pdk_machine =3D { - .name =3D "imx25_pdk", - .desc =3D "ARM i.MX25 PDK board (ARM926)", - .init =3D imx25_pdk_init, -}; - -static void imx25_pdk_machine_init(void) +static void imx25_pdk_machine_init(MachineClass *mc) { - qemu_register_machine(&imx25_pdk_machine); + mc->desc =3D "ARM i.MX25 PDK board (ARM926)"; + mc->init =3D imx25_pdk_init; } =20 -machine_init(imx25_pdk_machine_init) +DEFINE_MACHINE("imx25_pdk", imx25_pdk_machine_init) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index d87d36f..421bde9 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -619,18 +619,13 @@ static void integratorcp_init(MachineState *machine= ) arm_load_kernel(cpu, &integrator_binfo); } =20 -static QEMUMachine integratorcp_machine =3D { - .name =3D "integratorcp", - .desc =3D "ARM Integrator/CP (ARM926EJ-S)", - .init =3D integratorcp_init, -}; - -static void integratorcp_machine_init(void) +static void integratorcp_machine_init(MachineClass *mc) { - qemu_register_machine(&integratorcp_machine); + mc->desc =3D "ARM Integrator/CP (ARM926EJ-S)"; + mc->init =3D integratorcp_init; } =20 -machine_init(integratorcp_machine_init); +DEFINE_MACHINE("integratorcp", integratorcp_machine_init) =20 static Property core_properties[] =3D { DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0), diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 241b1d7..eff6f46 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -139,15 +139,10 @@ static void kzm_init(MachineState *machine) } } =20 -static QEMUMachine kzm_machine =3D { - .name =3D "kzm", - .desc =3D "ARM KZM Emulation Baseboard (ARM1136)", - .init =3D kzm_init, -}; - -static void kzm_machine_init(void) +static void kzm_machine_init(MachineClass *mc) { - qemu_register_machine(&kzm_machine); + mc->desc =3D "ARM KZM Emulation Baseboard (ARM1136)"; + mc->init =3D kzm_init; } =20 -machine_init(kzm_machine_init) +DEFINE_MACHINE("kzm", kzm_machine_init) diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index 03e9fa5..e434cb6 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -188,15 +188,10 @@ static void mainstone_init(MachineState *machine) mainstone_common_init(get_system_memory(), machine, mainstone, 0x196= ); } =20 -static QEMUMachine mainstone2_machine =3D { - .name =3D "mainstone", - .desc =3D "Mainstone II (PXA27x)", - .init =3D mainstone_init, -}; - -static void mainstone_machine_init(void) +static void mainstone2_machine_init(MachineClass *mc) { - qemu_register_machine(&mainstone2_machine); + mc->desc =3D "Mainstone II (PXA27x)"; + mc->init =3D mainstone_init; } =20 -machine_init(mainstone_machine_init); +DEFINE_MACHINE("mainstone", mainstone2_machine_init) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 5cff3d41..b534bb9 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1709,18 +1709,13 @@ static void musicpal_init(MachineState *machine) arm_load_kernel(cpu, &musicpal_binfo); } =20 -static QEMUMachine musicpal_machine =3D { - .name =3D "musicpal", - .desc =3D "Marvell 88w8618 / MusicPal (ARM926EJ-S)", - .init =3D musicpal_init, -}; - -static void musicpal_machine_init(void) +static void musicpal_machine_init(MachineClass *mc) { - qemu_register_machine(&musicpal_machine); + mc->desc =3D "Marvell 88w8618 / MusicPal (ARM926EJ-S)"; + mc->init =3D musicpal_init; } =20 -machine_init(musicpal_machine_init); +DEFINE_MACHINE("musicpal", musicpal_machine_init) =20 static void mv88w8618_wlan_class_init(ObjectClass *klass, void *data) { diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index 8f26780..a3b9e82 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -43,15 +43,10 @@ static void netduino2_init(MachineState *machine) } } =20 -static QEMUMachine netduino2_machine =3D { - .name =3D "netduino2", - .desc =3D "Netduino 2 Machine", - .init =3D netduino2_init, -}; - -static void netduino2_machine_init(void) +static void netduino2_machine_init(MachineClass *mc) { - qemu_register_machine(&netduino2_machine); + mc->desc =3D "Netduino 2 Machine"; + mc->init =3D netduino2_init; } =20 -machine_init(netduino2_machine_init); +DEFINE_MACHINE("netduino2", netduino2_machine_init) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index a659e85..af28449 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -1413,24 +1413,20 @@ static void n810_init(MachineState *machine) n8x0_init(machine, &n810_binfo, 810); } =20 -static QEMUMachine n800_machine =3D { - .name =3D "n800", - .desc =3D "Nokia N800 tablet aka. RX-34 (OMAP2420)", - .init =3D n800_init, - .default_boot_order =3D "", -}; +static void n800_machine_init(MachineClass *mc) +{ + mc->desc =3D "Nokia N800 tablet aka. RX-34 (OMAP2420)"; + mc->init =3D n800_init; + mc->default_boot_order =3D ""; +} =20 -static QEMUMachine n810_machine =3D { - .name =3D "n810", - .desc =3D "Nokia N810 tablet aka. RX-44 (OMAP2420)", - .init =3D n810_init, - .default_boot_order =3D "", -}; +DEFINE_MACHINE("n800", n800_machine_init) =20 -static void nseries_machine_init(void) +static void n810_machine_init(MachineClass *mc) { - qemu_register_machine(&n800_machine); - qemu_register_machine(&n810_machine); + mc->desc =3D "Nokia N810 tablet aka. RX-44 (OMAP2420)"; + mc->init =3D n810_init; + mc->default_boot_order =3D ""; } =20 -machine_init(nseries_machine_init); +DEFINE_MACHINE("n810", n810_machine_init) diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 4de88f3..68924fc 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -217,22 +217,18 @@ static void sx1_init_v2(MachineState *machine) sx1_init(machine, 2); } =20 -static QEMUMachine sx1_machine_v2 =3D { - .name =3D "sx1", - .desc =3D "Siemens SX1 (OMAP310) V2", - .init =3D sx1_init_v2, -}; +static void sx1_machine_v2_machine_init(MachineClass *mc) +{ + mc->desc =3D "Siemens SX1 (OMAP310) V2"; + mc->init =3D sx1_init_v2; +} =20 -static QEMUMachine sx1_machine_v1 =3D { - .name =3D "sx1-v1", - .desc =3D "Siemens SX1 (OMAP310) V1", - .init =3D sx1_init_v1, -}; +DEFINE_MACHINE("sx1", sx1_machine_v2_machine_init) =20 -static void sx1_machine_init(void) +static void sx1_machine_v1_machine_init(MachineClass *mc) { - qemu_register_machine(&sx1_machine_v2); - qemu_register_machine(&sx1_machine_v1); + mc->desc =3D "Siemens SX1 (OMAP310) V1"; + mc->init =3D sx1_init_v1; } =20 -machine_init(sx1_machine_init); +DEFINE_MACHINE("sx1-v1", sx1_machine_v1_machine_init) diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 1f84dbf..82ec99d 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -269,15 +269,10 @@ static void palmte_init(MachineState *machine) arm_load_kernel(mpu->cpu, &palmte_binfo); } =20 -static QEMUMachine palmte_machine =3D { - .name =3D "cheetah", - .desc =3D "Palm Tungsten|E aka. Cheetah PDA (OMAP310)", - .init =3D palmte_init, -}; - -static void palmte_machine_init(void) +static void palmte_machine_init(MachineClass *mc) { - qemu_register_machine(&palmte_machine); + mc->desc =3D "Palm Tungsten|E aka. Cheetah PDA (OMAP310)"; + mc->init =3D palmte_init; } =20 -machine_init(palmte_machine_init); +DEFINE_MACHINE("cheetah", palmte_machine_init) diff --git a/hw/arm/realview.c b/hw/arm/realview.c index 23779ec..6c83817 100644 --- a/hw/arm/realview.c +++ b/hw/arm/realview.c @@ -399,41 +399,39 @@ static void realview_pbx_a9_init(MachineState *mach= ine) realview_init(machine, BOARD_PBX_A9); } =20 -static QEMUMachine realview_eb_machine =3D { - .name =3D "realview-eb", - .desc =3D "ARM RealView Emulation Baseboard (ARM926EJ-S)", - .init =3D realview_eb_init, - .block_default_type =3D IF_SCSI, -}; +static void realview_eb_machine_init(MachineClass *mc) +{ + mc->desc =3D "ARM RealView Emulation Baseboard (ARM926EJ-S)"; + mc->init =3D realview_eb_init; + mc->block_default_type =3D IF_SCSI; +} =20 -static QEMUMachine realview_eb_mpcore_machine =3D { - .name =3D "realview-eb-mpcore", - .desc =3D "ARM RealView Emulation Baseboard (ARM11MPCore)", - .init =3D realview_eb_mpcore_init, - .block_default_type =3D IF_SCSI, - .max_cpus =3D 4, -}; +DEFINE_MACHINE("realview-eb", realview_eb_machine_init) =20 -static QEMUMachine realview_pb_a8_machine =3D { - .name =3D "realview-pb-a8", - .desc =3D "ARM RealView Platform Baseboard for Cortex-A8", - .init =3D realview_pb_a8_init, -}; +static void realview_eb_mpcore_machine_init(MachineClass *mc) +{ + mc->desc =3D "ARM RealView Emulation Baseboard (ARM11MPCore)"; + mc->init =3D realview_eb_mpcore_init; + mc->block_default_type =3D IF_SCSI; + mc->max_cpus =3D 4; +} =20 -static QEMUMachine realview_pbx_a9_machine =3D { - .name =3D "realview-pbx-a9", - .desc =3D "ARM RealView Platform Baseboard Explore for Cortex-A9", - .init =3D realview_pbx_a9_init, - .block_default_type =3D IF_SCSI, - .max_cpus =3D 4, -}; +DEFINE_MACHINE("realview-eb-mpcore", realview_eb_mpcore_machine_init) + +static void realview_pb_a8_machine_init(MachineClass *mc) +{ + mc->desc =3D "ARM RealView Platform Baseboard for Cortex-A8"; + mc->init =3D realview_pb_a8_init; +} + +DEFINE_MACHINE("realview-pb-a8", realview_pb_a8_machine_init) =20 -static void realview_machine_init(void) +static void realview_pbx_a9_machine_init(MachineClass *mc) { - qemu_register_machine(&realview_eb_machine); - qemu_register_machine(&realview_eb_mpcore_machine); - qemu_register_machine(&realview_pb_a8_machine); - qemu_register_machine(&realview_pbx_a9_machine); + mc->desc =3D "ARM RealView Platform Baseboard Explore for Cortex-A9"= ; + mc->init =3D realview_pbx_a9_init; + mc->block_default_type =3D IF_SCSI; + mc->max_cpus =3D 4; } =20 -machine_init(realview_machine_init); +DEFINE_MACHINE("realview-pbx-a9", realview_pbx_a9_machine_init) diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 6c2cbcb..0f59489 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -972,39 +972,37 @@ static void terrier_init(MachineState *machine) spitz_common_init(machine, terrier, 0x33f); } =20 -static QEMUMachine akitapda_machine =3D { - .name =3D "akita", - .desc =3D "Akita PDA (PXA270)", - .init =3D akita_init, -}; +static void akitapda_machine_init(MachineClass *mc) +{ + mc->desc =3D "Akita PDA (PXA270)"; + mc->init =3D akita_init; +} =20 -static QEMUMachine spitzpda_machine =3D { - .name =3D "spitz", - .desc =3D "Spitz PDA (PXA270)", - .init =3D spitz_init, -}; +DEFINE_MACHINE("akita", akitapda_machine_init) =20 -static QEMUMachine borzoipda_machine =3D { - .name =3D "borzoi", - .desc =3D "Borzoi PDA (PXA270)", - .init =3D borzoi_init, -}; +static void spitzpda_machine_init(MachineClass *mc) +{ + mc->desc =3D "Spitz PDA (PXA270)"; + mc->init =3D spitz_init; +} =20 -static QEMUMachine terrierpda_machine =3D { - .name =3D "terrier", - .desc =3D "Terrier PDA (PXA270)", - .init =3D terrier_init, -}; +DEFINE_MACHINE("spitz", spitzpda_machine_init) + +static void borzoipda_machine_init(MachineClass *mc) +{ + mc->desc =3D "Borzoi PDA (PXA270)"; + mc->init =3D borzoi_init; +} + +DEFINE_MACHINE("borzoi", borzoipda_machine_init) =20 -static void spitz_machine_init(void) +static void terrierpda_machine_init(MachineClass *mc) { - qemu_register_machine(&akitapda_machine); - qemu_register_machine(&spitzpda_machine); - qemu_register_machine(&borzoipda_machine); - qemu_register_machine(&terrierpda_machine); + mc->desc =3D "Terrier PDA (PXA270)"; + mc->init =3D terrier_init; } =20 -machine_init(spitz_machine_init); +DEFINE_MACHINE("terrier", terrierpda_machine_init) =20 static bool is_version_0(void *opaque, int version_id) { diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index a76f051..a97d9e3 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -1366,25 +1366,21 @@ static void lm3s6965evb_init(MachineState *machin= e) stellaris_init(kernel_filename, cpu_model, &stellaris_boards[1]); } =20 -static QEMUMachine lm3s811evb_machine =3D { - .name =3D "lm3s811evb", - .desc =3D "Stellaris LM3S811EVB", - .init =3D lm3s811evb_init, -}; +static void lm3s811evb_machine_init(MachineClass *mc) +{ + mc->desc =3D "Stellaris LM3S811EVB"; + mc->init =3D lm3s811evb_init; +} =20 -static QEMUMachine lm3s6965evb_machine =3D { - .name =3D "lm3s6965evb", - .desc =3D "Stellaris LM3S6965EVB", - .init =3D lm3s6965evb_init, -}; +DEFINE_MACHINE("lm3s811evb", lm3s811evb_machine_init) =20 -static void stellaris_machine_init(void) +static void lm3s6965evb_machine_init(MachineClass *mc) { - qemu_register_machine(&lm3s811evb_machine); - qemu_register_machine(&lm3s6965evb_machine); + mc->desc =3D "Stellaris LM3S6965EVB"; + mc->init =3D lm3s6965evb_init; } =20 -machine_init(stellaris_machine_init); +DEFINE_MACHINE("lm3s6965evb", lm3s6965evb_machine_init) =20 static void stellaris_i2c_class_init(ObjectClass *klass, void *data) { diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 2c216e9..51d0b89 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -252,18 +252,13 @@ static void tosa_init(MachineState *machine) sl_bootparam_write(SL_PXA_PARAM_BASE); } =20 -static QEMUMachine tosapda_machine =3D { - .name =3D "tosa", - .desc =3D "Tosa PDA (PXA255)", - .init =3D tosa_init, -}; - -static void tosapda_machine_init(void) +static void tosapda_machine_init(MachineClass *mc) { - qemu_register_machine(&tosapda_machine); + mc->desc =3D "Tosa PDA (PXA255)"; + mc->init =3D tosa_init; } =20 -machine_init(tosapda_machine_init); +DEFINE_MACHINE("tosa", tosapda_machine_init) =20 static void tosa_dac_class_init(ObjectClass *klass, void *data) { diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 6c69f4e..54281f4 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -391,27 +391,23 @@ static void vab_init(MachineState *machine) versatile_init(machine, 0x25e); } =20 -static QEMUMachine versatilepb_machine =3D { - .name =3D "versatilepb", - .desc =3D "ARM Versatile/PB (ARM926EJ-S)", - .init =3D vpb_init, - .block_default_type =3D IF_SCSI, -}; +static void versatilepb_machine_init(MachineClass *mc) +{ + mc->desc =3D "ARM Versatile/PB (ARM926EJ-S)"; + mc->init =3D vpb_init; + mc->block_default_type =3D IF_SCSI; +} =20 -static QEMUMachine versatileab_machine =3D { - .name =3D "versatileab", - .desc =3D "ARM Versatile/AB (ARM926EJ-S)", - .init =3D vab_init, - .block_default_type =3D IF_SCSI, -}; +DEFINE_MACHINE("versatilepb", versatilepb_machine_init) =20 -static void versatile_machine_init(void) +static void versatileab_machine_init(MachineClass *mc) { - qemu_register_machine(&versatilepb_machine); - qemu_register_machine(&versatileab_machine); + mc->desc =3D "ARM Versatile/AB (ARM926EJ-S)"; + mc->init =3D vab_init; + mc->block_default_type =3D IF_SCSI; } =20 -machine_init(versatile_machine_init); +DEFINE_MACHINE("versatileab", versatileab_machine_init) =20 static void vpb_sic_class_init(ObjectClass *klass, void *data) { diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 37dc0b0..9f89483 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -255,18 +255,13 @@ static void zynq_init(MachineState *machine) arm_load_kernel(ARM_CPU(first_cpu), &zynq_binfo); } =20 -static QEMUMachine zynq_machine =3D { - .name =3D "xilinx-zynq-a9", - .desc =3D "Xilinx Zynq Platform Baseboard for Cortex-A9", - .init =3D zynq_init, - .block_default_type =3D IF_SCSI, - .max_cpus =3D 1, - .no_sdcard =3D 1, -}; - -static void zynq_machine_init(void) +static void zynq_machine_init(MachineClass *mc) { - qemu_register_machine(&zynq_machine); + mc->desc =3D "Xilinx Zynq Platform Baseboard for Cortex-A9"; + mc->init =3D zynq_init; + mc->block_default_type =3D IF_SCSI; + mc->max_cpus =3D 1; + mc->no_sdcard =3D 1; } =20 -machine_init(zynq_machine_init); +DEFINE_MACHINE("xilinx-zynq-a9", zynq_machine_init) diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c index f94da86..2899698 100644 --- a/hw/arm/xlnx-ep108.c +++ b/hw/arm/xlnx-ep108.c @@ -68,15 +68,10 @@ static void xlnx_ep108_init(MachineState *machine) arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_ep108_binfo); } =20 -static QEMUMachine xlnx_ep108_machine =3D { - .name =3D "xlnx-ep108", - .desc =3D "Xilinx ZynqMP EP108 board", - .init =3D xlnx_ep108_init, -}; - -static void xlnx_ep108_machine_init(void) +static void xlnx_ep108_machine_init(MachineClass *mc) { - qemu_register_machine(&xlnx_ep108_machine); + mc->desc =3D "Xilinx ZynqMP EP108 board"; + mc->init =3D xlnx_ep108_init; } =20 -machine_init(xlnx_ep108_machine_init); +DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init) diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 1735547..b44eb76 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -372,15 +372,10 @@ static void z2_init(MachineState *machine) arm_load_kernel(mpu->cpu, &z2_binfo); } =20 -static QEMUMachine z2_machine =3D { - .name =3D "z2", - .desc =3D "Zipit Z2 (PXA27x)", - .init =3D z2_init, -}; - -static void z2_machine_init(void) +static void z2_machine_init(MachineClass *mc) { - qemu_register_machine(&z2_machine); + mc->desc =3D "Zipit Z2 (PXA27x)"; + mc->init =3D z2_init; } =20 -machine_init(z2_machine_init); +DEFINE_MACHINE("z2", z2_machine_init) diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 1ec7c3b..f36fbf2 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -19,17 +19,11 @@ static void machine_none_init(MachineState *machine) { } =20 -static QEMUMachine machine_none =3D { - .name =3D "none", - .desc =3D "empty machine", - .init =3D machine_none_init, - .max_cpus =3D 0, -}; - -static void register_machines(void) +static void machine_none_machine_init(MachineClass *mc) { - qemu_register_machine(&machine_none); + mc->desc =3D "empty machine"; + mc->init =3D machine_none_init; + mc->max_cpus =3D 0; } =20 -machine_init(register_machines); - +DEFINE_MACHINE("none", machine_none_machine_init) diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index d948449..de880d1 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -351,16 +351,11 @@ void axisdev88_init(MachineState *machine) } } =20 -static QEMUMachine axisdev88_machine =3D { - .name =3D "axis-dev88", - .desc =3D "AXIS devboard 88", - .init =3D axisdev88_init, - .is_default =3D 1, -}; - -static void axisdev88_machine_init(void) +static void axisdev88_machine_init(MachineClass *mc) { - qemu_register_machine(&axisdev88_machine); + mc->desc =3D "AXIS devboard 88"; + mc->init =3D axisdev88_init; + mc->is_default =3D 1; } =20 -machine_init(axisdev88_machine_init); +DEFINE_MACHINE("axis-dev88", axisdev88_machine_init) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 70f48d3..04d2066 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -292,24 +292,20 @@ static void lm32_uclinux_init(MachineState *machine= ) qemu_register_reset(main_cpu_reset, reset_info); } =20 -static QEMUMachine lm32_evr_machine =3D { - .name =3D "lm32-evr", - .desc =3D "LatticeMico32 EVR32 eval system", - .init =3D lm32_evr_init, - .is_default =3D 1, -}; - -static QEMUMachine lm32_uclinux_machine =3D { - .name =3D "lm32-uclinux", - .desc =3D "lm32 platform for uClinux and u-boot by Theobroma Systems= ", - .init =3D lm32_uclinux_init, - .is_default =3D 0, -}; - -static void lm32_machine_init(void) +static void lm32_evr_machine_init(MachineClass *mc) { - qemu_register_machine(&lm32_uclinux_machine); - qemu_register_machine(&lm32_evr_machine); + mc->desc =3D "LatticeMico32 EVR32 eval system"; + mc->init =3D lm32_evr_init; + mc->is_default =3D 1; } =20 -machine_init(lm32_machine_init); +DEFINE_MACHINE("lm32-evr", lm32_evr_machine_init) + +static void lm32_uclinux_machine_init(MachineClass *mc) +{ + mc->desc =3D "lm32 platform for uClinux and u-boot by Theobroma Syst= ems"; + mc->init =3D lm32_uclinux_init; + mc->is_default =3D 0; +} + +DEFINE_MACHINE("lm32-uclinux", lm32_uclinux_machine_init) diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index e755f5b..cb30850 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -209,16 +209,11 @@ milkymist_init(MachineState *machine) qemu_register_reset(main_cpu_reset, reset_info); } =20 -static QEMUMachine milkymist_machine =3D { - .name =3D "milkymist", - .desc =3D "Milkymist One", - .init =3D milkymist_init, - .is_default =3D 0, -}; - -static void milkymist_machine_init(void) +static void milkymist_machine_init(MachineClass *mc) { - qemu_register_machine(&milkymist_machine); + mc->desc =3D "Milkymist One"; + mc->init =3D milkymist_init; + mc->is_default =3D 0; } =20 -machine_init(milkymist_machine_init); +DEFINE_MACHINE("milkymist", milkymist_machine_init) diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index b18dc7f..aa49cd5 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -89,15 +89,10 @@ static void an5206_init(MachineState *machine) env->pc =3D entry; } =20 -static QEMUMachine an5206_machine =3D { - .name =3D "an5206", - .desc =3D "Arnewsh 5206", - .init =3D an5206_init, -}; - -static void an5206_machine_init(void) +static void an5206_machine_init(MachineClass *mc) { - qemu_register_machine(&an5206_machine); + mc->desc =3D "Arnewsh 5206"; + mc->init =3D an5206_init; } =20 -machine_init(an5206_machine_init); +DEFINE_MACHINE("an5206", an5206_machine_init) diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c index 5b77d93..d4f2073 100644 --- a/hw/m68k/dummy_m68k.c +++ b/hw/m68k/dummy_m68k.c @@ -72,15 +72,10 @@ static void dummy_m68k_init(MachineState *machine) env->pc =3D entry; } =20 -static QEMUMachine dummy_m68k_machine =3D { - .name =3D "dummy", - .desc =3D "Dummy board", - .init =3D dummy_m68k_init, -}; - -static void dummy_m68k_machine_init(void) +static void dummy_m68k_machine_init(MachineClass *mc) { - qemu_register_machine(&dummy_m68k_machine); + mc->desc =3D "Dummy board"; + mc->init =3D dummy_m68k_init; } =20 -machine_init(dummy_m68k_machine_init); +DEFINE_MACHINE("dummy", dummy_m68k_machine_init) diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index c38ffb8..c3365eb 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -294,16 +294,11 @@ static void mcf5208evb_init(MachineState *machine) env->pc =3D entry; } =20 -static QEMUMachine mcf5208evb_machine =3D { - .name =3D "mcf5208evb", - .desc =3D "MCF5206EVB", - .init =3D mcf5208evb_init, - .is_default =3D 1, -}; - -static void mcf5208evb_machine_init(void) +static void mcf5208evb_machine_init(MachineClass *mc) { - qemu_register_machine(&mcf5208evb_machine); + mc->desc =3D "MCF5206EVB"; + mc->init =3D mcf5208evb_init; + mc->is_default =3D 1; } =20 -machine_init(mcf5208evb_machine_init); +DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogi= x_ml605_mmu.c index d75b053..462060f 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -206,16 +206,11 @@ petalogix_ml605_init(MachineState *machine) =20 } =20 -static QEMUMachine petalogix_ml605_machine =3D { - .name =3D "petalogix-ml605", - .desc =3D "PetaLogix linux refdesign for xilinx ml605 little endian"= , - .init =3D petalogix_ml605_init, - .is_default =3D 0, -}; - -static void petalogix_ml605_machine_init(void) +static void petalogix_ml605_machine_init(MachineClass *mc) { - qemu_register_machine(&petalogix_ml605_machine); + mc->desc =3D "PetaLogix linux refdesign for xilinx ml605 little endi= an"; + mc->init =3D petalogix_ml605_init; + mc->is_default =3D 0; } =20 -machine_init(petalogix_ml605_machine_init); +DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init) diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/pet= alogix_s3adsp1800_mmu.c index 701b435..3381156 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -124,16 +124,11 @@ petalogix_s3adsp1800_init(MachineState *machine) NULL); } =20 -static QEMUMachine petalogix_s3adsp1800_machine =3D { - .name =3D "petalogix-s3adsp1800", - .desc =3D "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800", - .init =3D petalogix_s3adsp1800_init, - .is_default =3D 1, -}; - -static void petalogix_s3adsp1800_machine_init(void) +static void petalogix_s3adsp1800_machine_init(MachineClass *mc) { - qemu_register_machine(&petalogix_s3adsp1800_machine); + mc->desc =3D "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800= "; + mc->init =3D petalogix_s3adsp1800_init; + mc->is_default =3D 1; } =20 -machine_init(petalogix_s3adsp1800_machine_init); +DEFINE_MACHINE("petalogix-s3adsp1800", petalogix_s3adsp1800_machine_init= ) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index b8a11e4..e44521f 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -381,15 +381,10 @@ static void mips_fulong2e_init(MachineState *machin= e) network_init(pci_bus); } =20 -static QEMUMachine mips_fulong2e_machine =3D { - .name =3D "fulong2e", - .desc =3D "Fulong 2e mini pc", - .init =3D mips_fulong2e_init, -}; - -static void mips_fulong2e_machine_init(void) +static void mips_fulong2e_machine_init(MachineClass *mc) { - qemu_register_machine(&mips_fulong2e_machine); + mc->desc =3D "Fulong 2e mini pc"; + mc->init =3D mips_fulong2e_init; } =20 -machine_init(mips_fulong2e_machine_init); +DEFINE_MACHINE("fulong2e", mips_fulong2e_machine_init) diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index f944c4c..d3627ba 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -349,24 +349,20 @@ void mips_pica61_init(MachineState *machine) mips_jazz_init(machine, JAZZ_PICA61); } =20 -static QEMUMachine mips_magnum_machine =3D { - .name =3D "magnum", - .desc =3D "MIPS Magnum", - .init =3D mips_magnum_init, - .block_default_type =3D IF_SCSI, -}; +static void mips_magnum_machine_init(MachineClass *mc) +{ + mc->desc =3D "MIPS Magnum"; + mc->init =3D mips_magnum_init; + mc->block_default_type =3D IF_SCSI; +} =20 -static QEMUMachine mips_pica61_machine =3D { - .name =3D "pica61", - .desc =3D "Acer Pica 61", - .init =3D mips_pica61_init, - .block_default_type =3D IF_SCSI, -}; +DEFINE_MACHINE("magnum", mips_magnum_machine_init) =20 -static void mips_jazz_machine_init(void) +static void mips_pica61_machine_init(MachineClass *mc) { - qemu_register_machine(&mips_magnum_machine); - qemu_register_machine(&mips_pica61_machine); + mc->desc =3D "Acer Pica 61"; + mc->init =3D mips_pica61_init; + mc->block_default_type =3D IF_SCSI; } =20 -machine_init(mips_jazz_machine_init); +DEFINE_MACHINE("pica61", mips_pica61_machine_init) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 1004e37..bb864fe 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1205,23 +1205,19 @@ static const TypeInfo mips_malta_device =3D { .class_init =3D mips_malta_class_init, }; =20 -static QEMUMachine mips_malta_machine =3D { - .name =3D "malta", - .desc =3D "MIPS Malta Core LV", - .init =3D mips_malta_init, - .max_cpus =3D 16, - .is_default =3D 1, -}; - -static void mips_malta_register_types(void) +static void mips_malta_machine_init(MachineClass *mc) { - type_register_static(&mips_malta_device); + mc->desc =3D "MIPS Malta Core LV"; + mc->init =3D mips_malta_init; + mc->max_cpus =3D 16; + mc->is_default =3D 1; } =20 -static void mips_malta_machine_init(void) +DEFINE_MACHINE("malta", mips_malta_machine_init) + +static void mips_malta_register_types(void) { - qemu_register_machine(&mips_malta_machine); + type_register_static(&mips_malta_device); } =20 type_init(mips_malta_register_types) -machine_init(mips_malta_machine_init); diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index 063151f..e651312 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -231,15 +231,10 @@ mips_mipssim_init(MachineState *machine) mipsnet_init(0x4200, env->irq[2], &nd_table[0]); } =20 -static QEMUMachine mips_mipssim_machine =3D { - .name =3D "mipssim", - .desc =3D "MIPS MIPSsim platform", - .init =3D mips_mipssim_init, -}; - -static void mips_mipssim_machine_init(void) +static void mips_mipssim_machine_init(MachineClass *mc) { - qemu_register_machine(&mips_mipssim_machine); + mc->desc =3D "MIPS MIPSsim platform"; + mc->init =3D mips_mipssim_init; } =20 -machine_init(mips_mipssim_machine_init); +DEFINE_MACHINE("mipssim", mips_mipssim_machine_init) diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index c961227..97628fc 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -298,15 +298,10 @@ void mips_r4k_init(MachineState *machine) isa_create_simple(isa_bus, "i8042"); } =20 -static QEMUMachine mips_machine =3D { - .name =3D "mips", - .desc =3D "mips r4k platform", - .init =3D mips_r4k_init, -}; - -static void mips_machine_init(void) +static void mips_machine_init(MachineClass *mc) { - qemu_register_machine(&mips_machine); + mc->desc =3D "mips r4k platform"; + mc->init =3D mips_r4k_init; } =20 -machine_init(mips_machine_init); +DEFINE_MACHINE("mips", mips_machine_init) diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 5e69e11..a3d1a1b 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -146,16 +146,11 @@ static void moxiesim_init(MachineState *machine) } } =20 -static QEMUMachine moxiesim_machine =3D { - .name =3D "moxiesim", - .desc =3D "Moxie simulator platform", - .init =3D moxiesim_init, - .is_default =3D 1, -}; - -static void moxie_machine_init(void) +static void moxiesim_machine_init(MachineClass *mc) { - qemu_register_machine(&moxiesim_machine); + mc->desc =3D "Moxie simulator platform"; + mc->init =3D moxiesim_init; + mc->is_default =3D 1; } =20 -machine_init(moxie_machine_init) +DEFINE_MACHINE("moxiesim", moxiesim_machine_init) diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 09285bd..5f26785 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -132,17 +132,12 @@ static void openrisc_sim_init(MachineState *machine= ) cpu_openrisc_load_kernel(ram_size, kernel_filename, cpu); } =20 -static QEMUMachine openrisc_sim_machine =3D { - .name =3D "or32-sim", - .desc =3D "or32 simulation", - .init =3D openrisc_sim_init, - .max_cpus =3D 1, - .is_default =3D 1, -}; - -static void openrisc_sim_machine_init(void) +static void openrisc_sim_machine_init(MachineClass *mc) { - qemu_register_machine(&openrisc_sim_machine); + mc->desc =3D "or32 simulation"; + mc->init =3D openrisc_sim_init; + mc->max_cpus =3D 1; + mc->is_default =3D 1; } =20 -machine_init(openrisc_sim_machine_init); +DEFINE_MACHINE("or32-sim", openrisc_sim_machine_init) diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 14b14ea..384b6e8 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -57,17 +57,12 @@ static void e500plat_init(MachineState *machine) ppce500_init(machine, ¶ms); } =20 -static QEMUMachine e500plat_machine =3D { - .name =3D "ppce500", - .desc =3D "generic paravirt e500 platform", - .init =3D e500plat_init, - .max_cpus =3D 32, - .has_dynamic_sysbus =3D true, -}; - -static void e500plat_machine_init(void) +static void e500plat_machine_init(MachineClass *mc) { - qemu_register_machine(&e500plat_machine); + mc->desc =3D "generic paravirt e500 platform"; + mc->init =3D e500plat_init; + mc->max_cpus =3D 32; + mc->has_dynamic_sysbus =3D true; } =20 -machine_init(e500plat_machine_init); +DEFINE_MACHINE("ppce500", e500plat_machine_init) diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 4c5fe46..5cba2cb 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -357,22 +357,17 @@ static int heathrow_kvm_type(const char *arg) return 2; } =20 -static QEMUMachine heathrow_machine =3D { - .name =3D "g3beige", - .desc =3D "Heathrow based PowerMAC", - .init =3D ppc_heathrow_init, - .max_cpus =3D MAX_CPUS, +static void heathrow_machine_init(MachineClass *mc) +{ + mc->desc =3D "Heathrow based PowerMAC"; + mc->init =3D ppc_heathrow_init; + mc->max_cpus =3D MAX_CPUS; #ifndef TARGET_PPC64 - .is_default =3D 1, + mc->is_default =3D 1; #endif /* TOFIX "cad" when Mac floppy is implemented */ - .default_boot_order =3D "cd", - .kvm_type =3D heathrow_kvm_type, -}; - -static void heathrow_machine_init(void) -{ - qemu_register_machine(&heathrow_machine); + mc->default_boot_order =3D "cd"; + mc->kvm_type =3D heathrow_kvm_type; } =20 -machine_init(heathrow_machine_init); +DEFINE_MACHINE("g3beige", heathrow_machine_init) diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index 3a3b141..0afbd34 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -50,16 +50,11 @@ static void mpc8544ds_init(MachineState *machine) } =20 =20 -static QEMUMachine ppce500_machine =3D { - .name =3D "mpc8544ds", - .desc =3D "mpc8544ds", - .init =3D mpc8544ds_init, - .max_cpus =3D 15, -}; - -static void ppce500_machine_init(void) +static void ppce500_machine_init(MachineClass *mc) { - qemu_register_machine(&ppce500_machine); + mc->desc =3D "mpc8544ds"; + mc->init =3D mpc8544ds_init; + mc->max_cpus =3D 15; } =20 -machine_init(ppce500_machine_init); +DEFINE_MACHINE("mpc8544ds", ppce500_machine_init) diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 5389725..56980bf 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -369,11 +369,13 @@ static void ref405ep_init(MachineState *machine) #endif } =20 -static QEMUMachine ref405ep_machine =3D { - .name =3D "ref405ep", - .desc =3D "ref405ep", - .init =3D ref405ep_init, -}; +static void ref405ep_machine_init(MachineClass *mc) +{ + mc->desc =3D "ref405ep"; + mc->init =3D ref405ep_init; +} + +DEFINE_MACHINE("ref405ep", ref405ep_machine_init) =20 /***********************************************************************= ******/ /* AMCC Taihu evaluation board */ @@ -665,16 +667,10 @@ static void taihu_405ep_init(MachineState *machine) #endif } =20 -static QEMUMachine taihu_machine =3D { - .name =3D "taihu", - .desc =3D "taihu", - .init =3D taihu_405ep_init, -}; - -static void ppc405_machine_init(void) +static void taihu_machine_init(MachineClass *mc) { - qemu_register_machine(&ref405ep_machine); - qemu_register_machine(&taihu_machine); + mc->desc =3D "taihu"; + mc->init =3D taihu_405ep_init; } =20 -machine_init(ppc405_machine_init); +DEFINE_MACHINE("taihu", taihu_machine_init) diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 032fa80..4726832 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -293,15 +293,10 @@ static void bamboo_init(MachineState *machine) kvmppc_init(); } =20 -static QEMUMachine bamboo_machine =3D { - .name =3D "bamboo", - .desc =3D "bamboo", - .init =3D bamboo_init, -}; - -static void bamboo_machine_init(void) +static void bamboo_machine_init(MachineClass *mc) { - qemu_register_machine(&bamboo_machine); + mc->desc =3D "bamboo"; + mc->init =3D bamboo_init; } =20 -machine_init(bamboo_machine_init); +DEFINE_MACHINE("bamboo", bamboo_machine_init) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 81f0838..9d6d70a 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -687,17 +687,12 @@ static void ppc_prep_init(MachineState *machine) graphic_width, graphic_height, graphic_depth); } =20 -static QEMUMachine prep_machine =3D { - .name =3D "prep", - .desc =3D "PowerPC PREP platform", - .init =3D ppc_prep_init, - .max_cpus =3D MAX_CPUS, - .default_boot_order =3D "cad", -}; - -static void prep_machine_init(void) +static void prep_machine_init(MachineClass *mc) { - qemu_register_machine(&prep_machine); + mc->desc =3D "PowerPC PREP platform"; + mc->init =3D ppc_prep_init; + mc->max_cpus =3D MAX_CPUS; + mc->default_boot_order =3D "cad"; } =20 -machine_init(prep_machine_init); +DEFINE_MACHINE("prep", prep_machine_init) diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index de86f7c..457d762 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -297,15 +297,10 @@ static void virtex_init(MachineState *machine) env->load_info =3D &boot_info; } =20 -static QEMUMachine virtex_machine =3D { - .name =3D "virtex-ml507", - .desc =3D "Xilinx Virtex ML507 reference design", - .init =3D virtex_init, -}; - -static void virtex_machine_init(void) +static void virtex_machine_init(MachineClass *mc) { - qemu_register_machine(&virtex_machine); + mc->desc =3D "Xilinx Virtex ML507 reference design"; + mc->init =3D virtex_init; } =20 -machine_init(virtex_machine_init); +DEFINE_MACHINE("virtex-ml507", virtex_machine_init) diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 481bd92..c1ff9a0 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -354,15 +354,10 @@ static void r2d_init(MachineState *machine) SDRAM_BASE + BOOT_PARAMS_OFFSET); } =20 -static QEMUMachine r2d_machine =3D { - .name =3D "r2d", - .desc =3D "r2d-plus board", - .init =3D r2d_init, -}; - -static void r2d_machine_init(void) +static void r2d_machine_init(MachineClass *mc) { - qemu_register_machine(&r2d_machine); + mc->desc =3D "r2d-plus board"; + mc->init =3D r2d_init; } =20 -machine_init(r2d_machine_init); +DEFINE_MACHINE("r2d", r2d_machine_init) diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index 59bcc23..d508be9 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -87,16 +87,11 @@ static void shix_init(MachineState *machine) tc58128_init(s, "shix_linux_nand.bin", NULL); } =20 -static QEMUMachine shix_machine =3D { - .name =3D "shix", - .desc =3D "shix card", - .init =3D shix_init, - .is_default =3D 1, -}; - -static void shix_machine_init(void) +static void shix_machine_init(MachineClass *mc) { - qemu_register_machine(&shix_machine); + mc->desc =3D "shix card"; + mc->init =3D shix_init; + mc->is_default =3D 1; } =20 -machine_init(shix_machine_init); +DEFINE_MACHINE("shix", shix_machine_init) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index dd01842..ee73fea 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -216,15 +216,10 @@ static void leon3_generic_hw_init(MachineState *mac= hine) } } =20 -static QEMUMachine leon3_generic_machine =3D { - .name =3D "leon3_generic", - .desc =3D "Leon-3 generic", - .init =3D leon3_generic_hw_init, -}; - -static void leon3_machine_init(void) +static void leon3_generic_machine_init(MachineClass *mc) { - qemu_register_machine(&leon3_generic_machine); + mc->desc =3D "Leon-3 generic"; + mc->init =3D leon3_generic_hw_init; } =20 -machine_init(leon3_machine_init); +DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index dfb04f9..092e250 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -1420,81 +1420,99 @@ static void sbook_init(MachineState *machine) sun4m_hw_init(&sun4m_hwdefs[8], machine); } =20 -static QEMUMachine ss5_machine =3D { - .name =3D "SS-5", - .desc =3D "Sun4m platform, SPARCstation 5", - .init =3D ss5_init, - .block_default_type =3D IF_SCSI, - .is_default =3D 1, - .default_boot_order =3D "c", -}; +static void ss5_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4m platform, SPARCstation 5"; + mc->init =3D ss5_init; + mc->block_default_type =3D IF_SCSI; + mc->is_default =3D 1; + mc->default_boot_order =3D "c"; +} =20 -static QEMUMachine ss10_machine =3D { - .name =3D "SS-10", - .desc =3D "Sun4m platform, SPARCstation 10", - .init =3D ss10_init, - .block_default_type =3D IF_SCSI, - .max_cpus =3D 4, - .default_boot_order =3D "c", -}; +DEFINE_MACHINE("SS-5", ss5_machine_init) =20 -static QEMUMachine ss600mp_machine =3D { - .name =3D "SS-600MP", - .desc =3D "Sun4m platform, SPARCserver 600MP", - .init =3D ss600mp_init, - .block_default_type =3D IF_SCSI, - .max_cpus =3D 4, - .default_boot_order =3D "c", -}; +static void ss10_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4m platform, SPARCstation 10"; + mc->init =3D ss10_init; + mc->block_default_type =3D IF_SCSI; + mc->max_cpus =3D 4; + mc->default_boot_order =3D "c"; +} =20 -static QEMUMachine ss20_machine =3D { - .name =3D "SS-20", - .desc =3D "Sun4m platform, SPARCstation 20", - .init =3D ss20_init, - .block_default_type =3D IF_SCSI, - .max_cpus =3D 4, - .default_boot_order =3D "c", -}; +DEFINE_MACHINE("SS-10", ss10_machine_init) =20 -static QEMUMachine voyager_machine =3D { - .name =3D "Voyager", - .desc =3D "Sun4m platform, SPARCstation Voyager", - .init =3D vger_init, - .block_default_type =3D IF_SCSI, - .default_boot_order =3D "c", -}; +static void ss600mp_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4m platform, SPARCserver 600MP"; + mc->init =3D ss600mp_init; + mc->block_default_type =3D IF_SCSI; + mc->max_cpus =3D 4; + mc->default_boot_order =3D "c"; +} =20 -static QEMUMachine ss_lx_machine =3D { - .name =3D "LX", - .desc =3D "Sun4m platform, SPARCstation LX", - .init =3D ss_lx_init, - .block_default_type =3D IF_SCSI, - .default_boot_order =3D "c", -}; +DEFINE_MACHINE("SS-600MP", ss600mp_machine_init) =20 -static QEMUMachine ss4_machine =3D { - .name =3D "SS-4", - .desc =3D "Sun4m platform, SPARCstation 4", - .init =3D ss4_init, - .block_default_type =3D IF_SCSI, - .default_boot_order =3D "c", -}; +static void ss20_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4m platform, SPARCstation 20"; + mc->init =3D ss20_init; + mc->block_default_type =3D IF_SCSI; + mc->max_cpus =3D 4; + mc->default_boot_order =3D "c"; +} =20 -static QEMUMachine scls_machine =3D { - .name =3D "SPARCClassic", - .desc =3D "Sun4m platform, SPARCClassic", - .init =3D scls_init, - .block_default_type =3D IF_SCSI, - .default_boot_order =3D "c", -}; +DEFINE_MACHINE("SS-20", ss20_machine_init) =20 -static QEMUMachine sbook_machine =3D { - .name =3D "SPARCbook", - .desc =3D "Sun4m platform, SPARCbook", - .init =3D sbook_init, - .block_default_type =3D IF_SCSI, - .default_boot_order =3D "c", -}; +static void voyager_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4m platform, SPARCstation Voyager"; + mc->init =3D vger_init; + mc->block_default_type =3D IF_SCSI; + mc->default_boot_order =3D "c"; +} + +DEFINE_MACHINE("Voyager", voyager_machine_init) + +static void ss_lx_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4m platform, SPARCstation LX"; + mc->init =3D ss_lx_init; + mc->block_default_type =3D IF_SCSI; + mc->default_boot_order =3D "c"; +} + +DEFINE_MACHINE("LX", ss_lx_machine_init) + +static void ss4_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4m platform, SPARCstation 4"; + mc->init =3D ss4_init; + mc->block_default_type =3D IF_SCSI; + mc->default_boot_order =3D "c"; +} + +DEFINE_MACHINE("SS-4", ss4_machine_init) + +static void scls_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4m platform, SPARCClassic"; + mc->init =3D scls_init; + mc->block_default_type =3D IF_SCSI; + mc->default_boot_order =3D "c"; +} + +DEFINE_MACHINE("SPARCClassic", scls_machine_init) + +static void sbook_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4m platform, SPARCbook"; + mc->init =3D sbook_init; + mc->block_default_type =3D IF_SCSI; + mc->default_boot_order =3D "c"; +} + +DEFINE_MACHINE("SPARCbook", sbook_machine_init) =20 static void sun4m_register_types(void) { @@ -1504,18 +1522,4 @@ static void sun4m_register_types(void) type_register_static(&ram_info); } =20 -static void sun4m_machine_init(void) -{ - qemu_register_machine(&ss5_machine); - qemu_register_machine(&ss10_machine); - qemu_register_machine(&ss600mp_machine); - qemu_register_machine(&ss20_machine); - qemu_register_machine(&voyager_machine); - qemu_register_machine(&ss_lx_machine); - qemu_register_machine(&ss4_machine); - qemu_register_machine(&scls_machine); - qemu_register_machine(&sbook_machine); -} - type_init(sun4m_register_types) -machine_init(sun4m_machine_init); diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index e746f47..ab43dc6 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -965,30 +965,36 @@ static void niagara_init(MachineState *machine) sun4uv_init(get_system_memory(), machine, &hwdefs[2]); } =20 -static QEMUMachine sun4u_machine =3D { - .name =3D "sun4u", - .desc =3D "Sun4u platform", - .init =3D sun4u_init, - .max_cpus =3D 1, // XXX for now - .is_default =3D 1, - .default_boot_order =3D "c", -}; +static void sun4u_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4u platform"; + mc->init =3D sun4u_init; + mc->max_cpus =3D 1; /* XXX for now */ + mc->is_default =3D 1; + mc->default_boot_order =3D "c"; +} =20 -static QEMUMachine sun4v_machine =3D { - .name =3D "sun4v", - .desc =3D "Sun4v platform", - .init =3D sun4v_init, - .max_cpus =3D 1, // XXX for now - .default_boot_order =3D "c", -}; +DEFINE_MACHINE("sun4u", sun4u_machine_init) =20 -static QEMUMachine niagara_machine =3D { - .name =3D "Niagara", - .desc =3D "Sun4v platform, Niagara", - .init =3D niagara_init, - .max_cpus =3D 1, // XXX for now - .default_boot_order =3D "c", -}; +static void sun4v_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4v platform"; + mc->init =3D sun4v_init; + mc->max_cpus =3D 1; /* XXX for now */ + mc->default_boot_order =3D "c"; +} + +DEFINE_MACHINE("sun4v", sun4v_machine_init) + +static void niagara_machine_init(MachineClass *mc) +{ + mc->desc =3D "Sun4v platform, Niagara"; + mc->init =3D niagara_init; + mc->max_cpus =3D 1; /* XXX for now */ + mc->default_boot_order =3D "c"; +} + +DEFINE_MACHINE("Niagara", niagara_machine_init) =20 static void sun4u_register_types(void) { @@ -997,12 +1003,4 @@ static void sun4u_register_types(void) type_register_static(&ram_info); } =20 -static void sun4u_machine_init(void) -{ - qemu_register_machine(&sun4u_machine); - qemu_register_machine(&sun4v_machine); - qemu_register_machine(&niagara_machine); -} - type_init(sun4u_register_types) -machine_init(sun4u_machine_init); diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboar= d.c index ff4d2bd..8532410 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -115,16 +115,11 @@ static void tricoreboard_init(MachineState *machine= ) tricore_testboard_init(machine, 0x183); } =20 -static QEMUMachine ttb_machine =3D { - .name =3D "tricore_testboard", - .desc =3D "a minimal TriCore board", - .init =3D tricoreboard_init, - .is_default =3D 0, -}; - -static void tricore_testboard_machine_init(void) +static void ttb_machine_init(MachineClass *mc) { - qemu_register_machine(&ttb_machine); + mc->desc =3D "a minimal TriCore board"; + mc->init =3D tricoreboard_init; + mc->is_default =3D 0; } =20 -machine_init(tricore_testboard_machine_init); +DEFINE_MACHINE("tricore_testboard", ttb_machine_init) diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 3026d94..91117b2 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -130,16 +130,11 @@ static void puv3_init(MachineState *machine) puv3_load_kernel(kernel_filename); } =20 -static QEMUMachine puv3_machine =3D { - .name =3D "puv3", - .desc =3D "PKUnity Version-3 based on UniCore32", - .init =3D puv3_init, - .is_default =3D 1, -}; - -static void puv3_machine_init(void) +static void puv3_machine_init(MachineClass *mc) { - qemu_register_machine(&puv3_machine); + mc->desc =3D "PKUnity Version-3 based on UniCore32"; + mc->init =3D puv3_init; + mc->is_default =3D 1; } =20 -machine_init(puv3_machine_init) +DEFINE_MACHINE("puv3", puv3_machine_init) diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 2e545d2..23d6ef0 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -93,17 +93,12 @@ static void xen_init_pv(MachineState *machine) xen_init_display(xen_domid); } =20 -static QEMUMachine xenpv_machine =3D { - .name =3D "xenpv", - .desc =3D "Xen Para-virtualized PC", - .init =3D xen_init_pv, - .max_cpus =3D 1, - .default_machine_opts =3D "accel=3Dxen", -}; - -static void xenpv_machine_init(void) +static void xenpv_machine_init(MachineClass *mc) { - qemu_register_machine(&xenpv_machine); + mc->desc =3D "Xen Para-virtualized PC"; + mc->init =3D xen_init_pv; + mc->max_cpus =3D 1; + mc->default_machine_opts =3D "accel=3Dxen"; } =20 -machine_init(xenpv_machine_init); +DEFINE_MACHINE("xenpv", xenpv_machine_init) diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index 3a8140a..aa1cd10 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -104,17 +104,12 @@ static void xtensa_sim_init(MachineState *machine) } } =20 -static QEMUMachine xtensa_sim_machine =3D { - .name =3D "sim", - .desc =3D "sim machine (" XTENSA_DEFAULT_CPU_MODEL ")", - .is_default =3D true, - .init =3D xtensa_sim_init, - .max_cpus =3D 4, -}; - -static void xtensa_sim_machine_init(void) +static void xtensa_sim_machine_init(MachineClass *mc) { - qemu_register_machine(&xtensa_sim_machine); + mc->desc =3D "sim machine (" XTENSA_DEFAULT_CPU_MODEL ")"; + mc->is_default =3D true; + mc->init =3D xtensa_sim_init; + mc->max_cpus =3D 4; } =20 -machine_init(xtensa_sim_machine_init); +DEFINE_MACHINE("sim", xtensa_sim_machine_init) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 5030ec9..d6ddfa1 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -428,40 +428,38 @@ static void xtensa_kc705_init(MachineState *machine= ) lx_init(&kc705_board, machine); } =20 -static QEMUMachine xtensa_lx60_machine =3D { - .name =3D "lx60", - .desc =3D "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")", - .init =3D xtensa_lx60_init, - .max_cpus =3D 4, -}; +static void xtensa_lx60_machine_init(MachineClass *mc) +{ + mc->desc =3D "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")"; + mc->init =3D xtensa_lx60_init; + mc->max_cpus =3D 4; +} =20 -static QEMUMachine xtensa_lx200_machine =3D { - .name =3D "lx200", - .desc =3D "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")", - .init =3D xtensa_lx200_init, - .max_cpus =3D 4, -}; +DEFINE_MACHINE("lx60", xtensa_lx60_machine_init) =20 -static QEMUMachine xtensa_ml605_machine =3D { - .name =3D "ml605", - .desc =3D "ml605 EVB (" XTENSA_DEFAULT_CPU_MODEL ")", - .init =3D xtensa_ml605_init, - .max_cpus =3D 4, -}; +static void xtensa_lx200_machine_init(MachineClass *mc) +{ + mc->desc =3D "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")"; + mc->init =3D xtensa_lx200_init; + mc->max_cpus =3D 4; +} =20 -static QEMUMachine xtensa_kc705_machine =3D { - .name =3D "kc705", - .desc =3D "kc705 EVB (" XTENSA_DEFAULT_CPU_MODEL ")", - .init =3D xtensa_kc705_init, - .max_cpus =3D 4, -}; +DEFINE_MACHINE("lx200", xtensa_lx200_machine_init) + +static void xtensa_ml605_machine_init(MachineClass *mc) +{ + mc->desc =3D "ml605 EVB (" XTENSA_DEFAULT_CPU_MODEL ")"; + mc->init =3D xtensa_ml605_init; + mc->max_cpus =3D 4; +} + +DEFINE_MACHINE("ml605", xtensa_ml605_machine_init) =20 -static void xtensa_lx_machines_init(void) +static void xtensa_kc705_machine_init(MachineClass *mc) { - qemu_register_machine(&xtensa_lx60_machine); - qemu_register_machine(&xtensa_lx200_machine); - qemu_register_machine(&xtensa_ml605_machine); - qemu_register_machine(&xtensa_kc705_machine); + mc->desc =3D "kc705 EVB (" XTENSA_DEFAULT_CPU_MODEL ")"; + mc->init =3D xtensa_kc705_init; + mc->max_cpus =3D 4; } =20 -machine_init(xtensa_lx_machines_init); +DEFINE_MACHINE("kc705", xtensa_kc705_machine_init) --=20 2.1.4