From f80f9ec9a63bb2200d614feb658a77b78f9a4bba Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 20 May 2009 18:38:09 -0500 Subject: Convert machine registration to use module init functions This cleans up quite a lot of #ifdefs, extern variables, and other ugliness. Signed-off-by: Anthony Liguori --- hw/nseries.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'hw/nseries.c') diff --git a/hw/nseries.c b/hw/nseries.c index daf1b8ba92..c219bfe402 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1403,14 +1403,22 @@ static void n810_init(ram_addr_t ram_size, cpu_model, &n810_binfo, 810); } -QEMUMachine n800_machine = { +static QEMUMachine n800_machine = { .name = "n800", .desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)", .init = n800_init, }; -QEMUMachine n810_machine = { +static QEMUMachine n810_machine = { .name = "n810", .desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)", .init = n810_init, }; + +static void nseries_machine_init(void) +{ + qemu_register_machine(&n800_machine); + qemu_register_machine(&n810_machine); +} + +machine_init(nseries_machine_init); -- cgit v1.2.3