Am 04.09.2015 um 20:37 schrieb Eduardo Habkost:
> Convert all machines to use DEFINE_MACHINE instead of QEMUMachine
> automatically using a script.
>
> Cc: Richard Henderson <r...@twiddle.net>
> Cc: Peter Maydell <peter.mayd...@linaro.org>
> Cc: Li Guang <lig.f...@cn.fujitsu.com>
> Cc: Antony Pavlov <antonynpav...@gmail.com>
> Cc: Evgeny Voevodin <e.voevo...@samsung.com>
> Cc: Maksim Kozlov <m.koz...@samsung.com>
> Cc: Igor Mitsyanko <i.mitsya...@gmail.com>
> Cc: Dmitry Solodkiy <d.solod...@samsung.com>
> Cc: Rob Herring <r...@kernel.org>
> Cc: Peter Chubb <peter.ch...@nicta.com.au>
> Cc: Jan Kiszka <jan.kis...@web.de>
> Cc: Andrzej Zaborowski <balr...@gmail.com>
> Cc: Peter Crosthwaite <peter.crosthwa...@xilinx.com>
> Cc: "Edgar E. Iglesias" <edgar.igles...@gmail.com>
> Cc: Michael Walle <mich...@walle.cc>
> Cc: Aurelien Jarno <aurel...@aurel32.net>
> Cc: Leon Alrae <leon.al...@imgtec.com>
> Cc: "Hervé Poussineau" <hpous...@reactos.org>
> Cc: Jia Liu <pro...@gmail.com>
> Cc: Alexander Graf <ag...@suse.de>
> Cc: Scott Wood <scottw...@freescale.com>
> Cc: "Andreas Färber" <andreas.faer...@web.de>
> Cc: Magnus Damm <magnus.d...@gmail.com>
> Cc: Fabien Chouteau <chout...@adacore.com>
> Cc: Blue Swirl <blauwir...@gmail.com>
> Cc: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
> Cc: Bastian Koppelmann <kbast...@mail.uni-paderborn.de>
> Cc: Guan Xuetao <g...@mprc.pku.edu.cn>
> Cc: Max Filippov <jcmvb...@gmail.com>
> Cc: qemu-...@nongnu.org
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> Changes v1 -> v2:
> * Fix trailing spaces and newlines
> * Don't touch "//" comments on lines that we are not changing
> * Break long lines manually
>
> Changes v2 -> v3:
> * Replace "machine_machine" with "machine" in new variable and function
> names.
> Suggested-by: Michael Walle <mich...@walle.cc>
> * Eliminate empty mips_malta_machine_init() and sun4u_machine_init()
> functions
In most (but not all) cases the last DEFINE_MACHINE(...) added a white
line, dropped manually.
Your script also always added a semicolon after DEFINE_MACHINE(), even
when the original machine_init() did not have it. Cleaned up manually.
This scripted approach also regresses files with multiple machines to
now have one module init function per machine rather than one per file.
I'm also not clear on why you chose to diverge from devices in having a
machine-specific init function with MachineClass *mc arg rather than
having ObjectClass *oc, void *data and having a local mc variable.
But getting this conversion done to drop the old infrastructure seems
more important, and this can be revisited afterwards.
Regards,
Andreas
--
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 651e17b..27bdaa1 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -176,5 +176,4 @@ static void clipper_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("clipper", clipper_machine_init);
-
+DEFINE_MACHINE("clipper", clipper_machine_init)
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 4d6c8e7..4e6541e 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -64,5 +64,4 @@ static void collie_machine_init(MachineClass *mc)
mc->init = collie_init;
}
-DEFINE_MACHINE("collie", collie_machine_init);
-
+DEFINE_MACHINE("collie", collie_machine_init)
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 2274958..bf068cd 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -80,6 +80,4 @@ static void cubieboard_machine_init(MachineClass *mc)
mc->init = cubieboard_init;
}
-DEFINE_MACHINE("cubieboard", cubieboard_machine_init);
-
-
+DEFINE_MACHINE("cubieboard", cubieboard_machine_init)
diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index 3a6364c..710045a 100644
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -154,5 +154,4 @@ static void canon_a1100_machine_init(MachineClass *mc)
mc->init = &canon_a1100_init;
}
-DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init);
-
+DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init)
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 7c75acc..fadf372 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -151,7 +151,7 @@ static void exynos4_machine_nuri_machine_init(MachineClass *mc)
mc->max_cpus = EXYNOS4210_NCPUS;
}
-DEFINE_MACHINE("nuri", exynos4_machine_nuri_machine_init);
+DEFINE_MACHINE("nuri", exynos4_machine_nuri_machine_init)
static void exynos4_machine_smdkc210_machine_init(MachineClass *mc)
{
@@ -160,5 +160,4 @@ static void exynos4_machine_smdkc210_machine_init(MachineClass *mc)
mc->max_cpus = EXYNOS4210_NCPUS;
}
-DEFINE_MACHINE("smdkc210", exynos4_machine_smdkc210_machine_init);
-
+DEFINE_MACHINE("smdkc210", exynos4_machine_smdkc210_machine_init)
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 1dae67d..6dc98c8 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -127,7 +127,7 @@ static void connex_machine_init(MachineClass *mc)
mc->init = connex_init;
}
-DEFINE_MACHINE("connex", connex_machine_init);
+DEFINE_MACHINE("connex", connex_machine_init)
static void verdex_machine_init(MachineClass *mc)
{
@@ -135,5 +135,4 @@ static void verdex_machine_init(MachineClass *mc)
mc->init = verdex_init;
}
-DEFINE_MACHINE("verdex", verdex_machine_init);
-
+DEFINE_MACHINE("verdex", verdex_machine_init)
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 4ab13bd..9b2887e 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -399,7 +399,7 @@ static void highbank_machine_init(MachineClass *mc)
mc->max_cpus = 4;
}
-DEFINE_MACHINE("highbank", highbank_machine_init);
+DEFINE_MACHINE("highbank", highbank_machine_init)
static void midway_machine_init(MachineClass *mc)
{
@@ -409,5 +409,4 @@ static void midway_machine_init(MachineClass *mc)
mc->max_cpus = 4;
}
-DEFINE_MACHINE("midway", midway_machine_init);
-
+DEFINE_MACHINE("midway", midway_machine_init)
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index dd91d36..421bde9 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -625,8 +625,7 @@ static void integratorcp_machine_init(MachineClass *mc)
mc->init = integratorcp_init;
}
-DEFINE_MACHINE("integratorcp", integratorcp_machine_init);
-
+DEFINE_MACHINE("integratorcp", integratorcp_machine_init)
static Property core_properties[] = {
DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0),
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index cadb10c..eff6f46 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -145,5 +145,4 @@ static void kzm_machine_init(MachineClass *mc)
mc->init = kzm_init;
}
-DEFINE_MACHINE("kzm", kzm_machine_init);
-
+DEFINE_MACHINE("kzm", kzm_machine_init)
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index 722d0a5..e434cb6 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -194,5 +194,4 @@ static void mainstone2_machine_init(MachineClass *mc)
mc->init = mainstone_init;
}
-DEFINE_MACHINE("mainstone", mainstone2_machine_init);
-
+DEFINE_MACHINE("mainstone", mainstone2_machine_init)
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 428c744..b534bb9 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -1715,8 +1715,7 @@ static void musicpal_machine_init(MachineClass *mc)
mc->init = musicpal_init;
}
-DEFINE_MACHINE("musicpal", musicpal_machine_init);
-
+DEFINE_MACHINE("musicpal", musicpal_machine_init)
static void mv88w8618_wlan_class_init(ObjectClass *klass, void *data)
{
diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
index 976f69e..a3b9e82 100644
--- a/hw/arm/netduino2.c
+++ b/hw/arm/netduino2.c
@@ -49,5 +49,4 @@ static void netduino2_machine_init(MachineClass *mc)
mc->init = netduino2_init;
}
-DEFINE_MACHINE("netduino2", netduino2_machine_init);
-
+DEFINE_MACHINE("netduino2", netduino2_machine_init)
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 56ded1f..af28449 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -1420,7 +1420,7 @@ static void n800_machine_init(MachineClass *mc)
mc->default_boot_order = "";
}
-DEFINE_MACHINE("n800", n800_machine_init);
+DEFINE_MACHINE("n800", n800_machine_init)
static void n810_machine_init(MachineClass *mc)
{
@@ -1429,5 +1429,4 @@ static void n810_machine_init(MachineClass *mc)
mc->default_boot_order = "";
}
-DEFINE_MACHINE("n810", n810_machine_init);
-
+DEFINE_MACHINE("n810", n810_machine_init)
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index 994e4c1..68924fc 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -223,7 +223,7 @@ static void sx1_machine_v2_machine_init(MachineClass *mc)
mc->init = sx1_init_v2;
}
-DEFINE_MACHINE("sx1", sx1_machine_v2_machine_init);
+DEFINE_MACHINE("sx1", sx1_machine_v2_machine_init)
static void sx1_machine_v1_machine_init(MachineClass *mc)
{
@@ -231,5 +231,4 @@ static void sx1_machine_v1_machine_init(MachineClass *mc)
mc->init = sx1_init_v1;
}
-DEFINE_MACHINE("sx1-v1", sx1_machine_v1_machine_init);
-
+DEFINE_MACHINE("sx1-v1", sx1_machine_v1_machine_init)
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 7f364db..82ec99d 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -275,5 +275,4 @@ static void palmte_machine_init(MachineClass *mc)
mc->init = palmte_init;
}
-DEFINE_MACHINE("cheetah", palmte_machine_init);
-
+DEFINE_MACHINE("cheetah", palmte_machine_init)
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index da7133a..6c83817 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -406,7 +406,7 @@ static void realview_eb_machine_init(MachineClass *mc)
mc->block_default_type = IF_SCSI;
}
-DEFINE_MACHINE("realview-eb", realview_eb_machine_init);
+DEFINE_MACHINE("realview-eb", realview_eb_machine_init)
static void realview_eb_mpcore_machine_init(MachineClass *mc)
{
@@ -416,7 +416,7 @@ static void realview_eb_mpcore_machine_init(MachineClass *mc)
mc->max_cpus = 4;
}
-DEFINE_MACHINE("realview-eb-mpcore", realview_eb_mpcore_machine_init);
+DEFINE_MACHINE("realview-eb-mpcore", realview_eb_mpcore_machine_init)
static void realview_pb_a8_machine_init(MachineClass *mc)
{
@@ -424,7 +424,7 @@ static void realview_pb_a8_machine_init(MachineClass *mc)
mc->init = realview_pb_a8_init;
}
-DEFINE_MACHINE("realview-pb-a8", realview_pb_a8_machine_init);
+DEFINE_MACHINE("realview-pb-a8", realview_pb_a8_machine_init)
static void realview_pbx_a9_machine_init(MachineClass *mc)
{
@@ -434,5 +434,4 @@ static void realview_pbx_a9_machine_init(MachineClass *mc)
mc->max_cpus = 4;
}
-DEFINE_MACHINE("realview-pbx-a9", realview_pbx_a9_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 efbbe12..0f59489 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -978,7 +978,7 @@ static void akitapda_machine_init(MachineClass *mc)
mc->init = akita_init;
}
-DEFINE_MACHINE("akita", akitapda_machine_init);
+DEFINE_MACHINE("akita", akitapda_machine_init)
static void spitzpda_machine_init(MachineClass *mc)
{
@@ -986,7 +986,7 @@ static void spitzpda_machine_init(MachineClass *mc)
mc->init = spitz_init;
}
-DEFINE_MACHINE("spitz", spitzpda_machine_init);
+DEFINE_MACHINE("spitz", spitzpda_machine_init)
static void borzoipda_machine_init(MachineClass *mc)
{
@@ -994,7 +994,7 @@ static void borzoipda_machine_init(MachineClass *mc)
mc->init = borzoi_init;
}
-DEFINE_MACHINE("borzoi", borzoipda_machine_init);
+DEFINE_MACHINE("borzoi", borzoipda_machine_init)
static void terrierpda_machine_init(MachineClass *mc)
{
@@ -1002,8 +1002,7 @@ static void terrierpda_machine_init(MachineClass *mc)
mc->init = terrier_init;
}
-DEFINE_MACHINE("terrier", terrierpda_machine_init);
-
+DEFINE_MACHINE("terrier", terrierpda_machine_init)
static bool is_version_0(void *opaque, int version_id)
{
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index d7fdb77..a97d9e3 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -1372,7 +1372,7 @@ static void lm3s811evb_machine_init(MachineClass *mc)
mc->init = lm3s811evb_init;
}
-DEFINE_MACHINE("lm3s811evb", lm3s811evb_machine_init);
+DEFINE_MACHINE("lm3s811evb", lm3s811evb_machine_init)
static void lm3s6965evb_machine_init(MachineClass *mc)
{
@@ -1380,8 +1380,7 @@ static void lm3s6965evb_machine_init(MachineClass *mc)
mc->init = lm3s6965evb_init;
}
-DEFINE_MACHINE("lm3s6965evb", lm3s6965evb_machine_init);
-
+DEFINE_MACHINE("lm3s6965evb", lm3s6965evb_machine_init)
static void stellaris_i2c_class_init(ObjectClass *klass, void *data)
{
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index 38b49fa..51d0b89 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -258,8 +258,7 @@ static void tosapda_machine_init(MachineClass *mc)
mc->init = tosa_init;
}
-DEFINE_MACHINE("tosa", tosapda_machine_init);
-
+DEFINE_MACHINE("tosa", tosapda_machine_init)
static void tosa_dac_class_init(ObjectClass *klass, void *data)
{
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index e200865..54281f4 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -398,7 +398,7 @@ static void versatilepb_machine_init(MachineClass *mc)
mc->block_default_type = IF_SCSI;
}
-DEFINE_MACHINE("versatilepb", versatilepb_machine_init);
+DEFINE_MACHINE("versatilepb", versatilepb_machine_init)
static void versatileab_machine_init(MachineClass *mc)
{
@@ -407,8 +407,7 @@ static void versatileab_machine_init(MachineClass *mc)
mc->block_default_type = IF_SCSI;
}
-DEFINE_MACHINE("versatileab", versatileab_machine_init);
-
+DEFINE_MACHINE("versatileab", versatileab_machine_init)
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 5bb1b30..9f89483 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -264,5 +264,4 @@ static void zynq_machine_init(MachineClass *mc)
mc->no_sdcard = 1;
}
-DEFINE_MACHINE("xilinx-zynq-a9", 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 07a98ef..2899698 100644
--- a/hw/arm/xlnx-ep108.c
+++ b/hw/arm/xlnx-ep108.c
@@ -74,5 +74,4 @@ static void xlnx_ep108_machine_init(MachineClass *mc)
mc->init = xlnx_ep108_init;
}
-DEFINE_MACHINE("xlnx-ep108", 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 9961b7b..b44eb76 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -378,5 +378,4 @@ static void z2_machine_init(MachineClass *mc)
mc->init = z2_init;
}
-DEFINE_MACHINE("z2", z2_machine_init);
-
+DEFINE_MACHINE("z2", z2_machine_init)
diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 3157529..f36fbf2 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -26,6 +26,4 @@ static void machine_none_machine_init(MachineClass *mc)
mc->max_cpus = 0;
}
-DEFINE_MACHINE("none", machine_none_machine_init);
-
-
+DEFINE_MACHINE("none", machine_none_machine_init)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 110a3a0..de880d1 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -358,5 +358,4 @@ static void axisdev88_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("axis-dev88", 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 48a4f2b..04d2066 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -299,7 +299,7 @@ static void lm32_evr_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("lm32-evr", lm32_evr_machine_init);
+DEFINE_MACHINE("lm32-evr", lm32_evr_machine_init)
static void lm32_uclinux_machine_init(MachineClass *mc)
{
@@ -308,5 +308,4 @@ static void lm32_uclinux_machine_init(MachineClass *mc)
mc->is_default = 0;
}
-DEFINE_MACHINE("lm32-uclinux", lm32_uclinux_machine_init);
-
+DEFINE_MACHINE("lm32-uclinux", lm32_uclinux_machine_init)
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 447750b..cb30850 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -216,5 +216,4 @@ static void milkymist_machine_init(MachineClass *mc)
mc->is_default = 0;
}
-DEFINE_MACHINE("milkymist", milkymist_machine_init);
-
+DEFINE_MACHINE("milkymist", milkymist_machine_init)
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index aa557f6..aa49cd5 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -95,5 +95,4 @@ static void an5206_machine_init(MachineClass *mc)
mc->init = an5206_init;
}
-DEFINE_MACHINE("an5206", an5206_machine_init);
-
+DEFINE_MACHINE("an5206", an5206_machine_init)
diff --git a/hw/m68k/dummy_m68k.c b/hw/m68k/dummy_m68k.c
index b388daf..d4f2073 100644
--- a/hw/m68k/dummy_m68k.c
+++ b/hw/m68k/dummy_m68k.c
@@ -78,5 +78,4 @@ static void dummy_m68k_machine_init(MachineClass *mc)
mc->init = dummy_m68k_init;
}
-DEFINE_MACHINE("dummy", dummy_m68k_machine_init);
-
+DEFINE_MACHINE("dummy", dummy_m68k_machine_init)
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 2bd9f8f..c3365eb 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -301,5 +301,4 @@ static void mcf5208evb_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init);
-
+DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init)
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index d277582..462060f 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -213,5 +213,4 @@ static void petalogix_ml605_machine_init(MachineClass *mc)
mc->is_default = 0;
}
-DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init);
-
+DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init)
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index c2dd728..3381156 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -131,5 +131,4 @@ static void petalogix_s3adsp1800_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("petalogix-s3adsp1800", 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 c964592..e44521f 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -387,5 +387,4 @@ static void mips_fulong2e_machine_init(MachineClass *mc)
mc->init = mips_fulong2e_init;
}
-DEFINE_MACHINE("fulong2e", 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 38c4983..d3627ba 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -356,7 +356,7 @@ static void mips_magnum_machine_init(MachineClass *mc)
mc->block_default_type = IF_SCSI;
}
-DEFINE_MACHINE("magnum", mips_magnum_machine_init);
+DEFINE_MACHINE("magnum", mips_magnum_machine_init)
static void mips_pica61_machine_init(MachineClass *mc)
{
@@ -365,5 +365,4 @@ static void mips_pica61_machine_init(MachineClass *mc)
mc->block_default_type = IF_SCSI;
}
-DEFINE_MACHINE("pica61", mips_pica61_machine_init);
-
+DEFINE_MACHINE("pica61", mips_pica61_machine_init)
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index e43b743..bb864fe 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1213,7 +1213,7 @@ static void mips_malta_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("malta", mips_malta_machine_init);
+DEFINE_MACHINE("malta", mips_malta_machine_init)
static void mips_malta_register_types(void)
{
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index 70a0a85..e651312 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -237,5 +237,4 @@ static void mips_mipssim_machine_init(MachineClass *mc)
mc->init = mips_mipssim_init;
}
-DEFINE_MACHINE("mipssim", 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 24627e9..97628fc 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -304,5 +304,4 @@ static void mips_machine_init(MachineClass *mc)
mc->init = mips_r4k_init;
}
-DEFINE_MACHINE("mips", mips_machine_init);
-
+DEFINE_MACHINE("mips", mips_machine_init)
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 023b514..a3d1a1b 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -153,5 +153,4 @@ static void moxiesim_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("moxiesim", moxiesim_machine_init);
-
+DEFINE_MACHINE("moxiesim", moxiesim_machine_init)
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index ae97fba..5f26785 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -140,5 +140,4 @@ static void openrisc_sim_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("or32-sim", 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 66ad697..384b6e8 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -65,5 +65,4 @@ static void e500plat_machine_init(MachineClass *mc)
mc->has_dynamic_sysbus = true;
}
-DEFINE_MACHINE("ppce500", e500plat_machine_init);
-
+DEFINE_MACHINE("ppce500", e500plat_machine_init)
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index bd1e687..5cba2cb 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -370,5 +370,4 @@ static void heathrow_machine_init(MachineClass *mc)
mc->kvm_type = heathrow_kvm_type;
}
-DEFINE_MACHINE("g3beige", heathrow_machine_init);
-
+DEFINE_MACHINE("g3beige", heathrow_machine_init)
diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index 494ac07..0afbd34 100644
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -57,5 +57,4 @@ static void ppce500_machine_init(MachineClass *mc)
mc->max_cpus = 15;
}
-DEFINE_MACHINE("mpc8544ds", ppce500_machine_init);
-
+DEFINE_MACHINE("mpc8544ds", ppce500_machine_init)
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 5726f44..56980bf 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -375,7 +375,7 @@ static void ref405ep_machine_init(MachineClass *mc)
mc->init = ref405ep_init;
}
-DEFINE_MACHINE("ref405ep", ref405ep_machine_init);
+DEFINE_MACHINE("ref405ep", ref405ep_machine_init)
/*****************************************************************************/
/* AMCC Taihu evaluation board */
@@ -673,5 +673,4 @@ static void taihu_machine_init(MachineClass *mc)
mc->init = taihu_405ep_init;
}
-DEFINE_MACHINE("taihu", taihu_machine_init);
-
+DEFINE_MACHINE("taihu", taihu_machine_init)
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index e17dbe1..4726832 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -299,5 +299,4 @@ static void bamboo_machine_init(MachineClass *mc)
mc->init = bamboo_init;
}
-DEFINE_MACHINE("bamboo", bamboo_machine_init);
-
+DEFINE_MACHINE("bamboo", bamboo_machine_init)
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 8ca21d3..9d6d70a 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -695,5 +695,4 @@ static void prep_machine_init(MachineClass *mc)
mc->default_boot_order = "cad";
}
-DEFINE_MACHINE("prep", prep_machine_init);
-
+DEFINE_MACHINE("prep", prep_machine_init)
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 8537d12..457d762 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -303,5 +303,4 @@ static void virtex_machine_init(MachineClass *mc)
mc->init = virtex_init;
}
-DEFINE_MACHINE("virtex-ml507", virtex_machine_init);
-
+DEFINE_MACHINE("virtex-ml507", virtex_machine_init)
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 2c6de81..c1ff9a0 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -360,5 +360,4 @@ static void r2d_machine_init(MachineClass *mc)
mc->init = r2d_init;
}
-DEFINE_MACHINE("r2d", r2d_machine_init);
-
+DEFINE_MACHINE("r2d", r2d_machine_init)
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index 3e6bb36..d508be9 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -94,5 +94,4 @@ static void shix_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("shix", shix_machine_init);
-
+DEFINE_MACHINE("shix", shix_machine_init)
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 1eb728d..ee73fea 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -222,5 +222,4 @@ static void leon3_generic_machine_init(MachineClass *mc)
mc->init = leon3_generic_hw_init;
}
-DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init);
-
+DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init)
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index d044fdd..092e250 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -1429,7 +1429,7 @@ static void ss5_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("SS-5", ss5_machine_init);
+DEFINE_MACHINE("SS-5", ss5_machine_init)
static void ss10_machine_init(MachineClass *mc)
{
@@ -1440,7 +1440,7 @@ static void ss10_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("SS-10", ss10_machine_init);
+DEFINE_MACHINE("SS-10", ss10_machine_init)
static void ss600mp_machine_init(MachineClass *mc)
{
@@ -1451,7 +1451,7 @@ static void ss600mp_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("SS-600MP", ss600mp_machine_init);
+DEFINE_MACHINE("SS-600MP", ss600mp_machine_init)
static void ss20_machine_init(MachineClass *mc)
{
@@ -1462,7 +1462,7 @@ static void ss20_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("SS-20", ss20_machine_init);
+DEFINE_MACHINE("SS-20", ss20_machine_init)
static void voyager_machine_init(MachineClass *mc)
{
@@ -1472,7 +1472,7 @@ static void voyager_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("Voyager", voyager_machine_init);
+DEFINE_MACHINE("Voyager", voyager_machine_init)
static void ss_lx_machine_init(MachineClass *mc)
{
@@ -1482,7 +1482,7 @@ static void ss_lx_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("LX", ss_lx_machine_init);
+DEFINE_MACHINE("LX", ss_lx_machine_init)
static void ss4_machine_init(MachineClass *mc)
{
@@ -1492,7 +1492,7 @@ static void ss4_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("SS-4", ss4_machine_init);
+DEFINE_MACHINE("SS-4", ss4_machine_init)
static void scls_machine_init(MachineClass *mc)
{
@@ -1502,7 +1502,7 @@ static void scls_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("SPARCClassic", scls_machine_init);
+DEFINE_MACHINE("SPARCClassic", scls_machine_init)
static void sbook_machine_init(MachineClass *mc)
{
@@ -1512,7 +1512,7 @@ static void sbook_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("SPARCbook", sbook_machine_init);
+DEFINE_MACHINE("SPARCbook", sbook_machine_init)
static void sun4m_register_types(void)
{
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 42e8cbc..ab43dc6 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -974,7 +974,7 @@ static void sun4u_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("sun4u", sun4u_machine_init);
+DEFINE_MACHINE("sun4u", sun4u_machine_init)
static void sun4v_machine_init(MachineClass *mc)
{
@@ -984,7 +984,7 @@ static void sun4v_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("sun4v", sun4v_machine_init);
+DEFINE_MACHINE("sun4v", sun4v_machine_init)
static void niagara_machine_init(MachineClass *mc)
{
@@ -994,7 +994,7 @@ static void niagara_machine_init(MachineClass *mc)
mc->default_boot_order = "c";
}
-DEFINE_MACHINE("Niagara", niagara_machine_init);
+DEFINE_MACHINE("Niagara", niagara_machine_init)
static void sun4u_register_types(void)
{
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index d0dd0be..8532410 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -122,5 +122,4 @@ static void ttb_machine_init(MachineClass *mc)
mc->is_default = 0;
}
-DEFINE_MACHINE("tricore_testboard", ttb_machine_init);
-
+DEFINE_MACHINE("tricore_testboard", ttb_machine_init)
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 78bb161..91117b2 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -137,5 +137,4 @@ static void puv3_machine_init(MachineClass *mc)
mc->is_default = 1;
}
-DEFINE_MACHINE("puv3", 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 f19a8f4..23d6ef0 100644
--- a/hw/xenpv/xen_machine_pv.c
+++ b/hw/xenpv/xen_machine_pv.c
@@ -101,5 +101,4 @@ static void xenpv_machine_init(MachineClass *mc)
mc->default_machine_opts = "accel=xen";
}
-DEFINE_MACHINE("xenpv", xenpv_machine_init);
-
+DEFINE_MACHINE("xenpv", xenpv_machine_init)
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 0d0369d..aa1cd10 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -112,5 +112,4 @@ static void xtensa_sim_machine_init(MachineClass *mc)
mc->max_cpus = 4;
}
-DEFINE_MACHINE("sim", xtensa_sim_machine_init);
-
+DEFINE_MACHINE("sim", xtensa_sim_machine_init)
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index f65ed94..d6ddfa1 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -435,7 +435,7 @@ static void xtensa_lx60_machine_init(MachineClass *mc)
mc->max_cpus = 4;
}
-DEFINE_MACHINE("lx60", xtensa_lx60_machine_init);
+DEFINE_MACHINE("lx60", xtensa_lx60_machine_init)
static void xtensa_lx200_machine_init(MachineClass *mc)
{
@@ -444,7 +444,7 @@ static void xtensa_lx200_machine_init(MachineClass *mc)
mc->max_cpus = 4;
}
-DEFINE_MACHINE("lx200", xtensa_lx200_machine_init);
+DEFINE_MACHINE("lx200", xtensa_lx200_machine_init)
static void xtensa_ml605_machine_init(MachineClass *mc)
{
@@ -453,7 +453,7 @@ static void xtensa_ml605_machine_init(MachineClass *mc)
mc->max_cpus = 4;
}
-DEFINE_MACHINE("ml605", xtensa_ml605_machine_init);
+DEFINE_MACHINE("ml605", xtensa_ml605_machine_init)
static void xtensa_kc705_machine_init(MachineClass *mc)
{
@@ -462,5 +462,4 @@ static void xtensa_kc705_machine_init(MachineClass *mc)
mc->max_cpus = 4;
}
-DEFINE_MACHINE("kc705", xtensa_kc705_machine_init);
-
+DEFINE_MACHINE("kc705", xtensa_kc705_machine_init)
