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/gumstix.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'hw/gumstix.c') diff --git a/hw/gumstix.c b/hw/gumstix.c index 7dd67ce..85b95ee 100644 --- a/hw/gumstix.c +++ b/hw/gumstix.c @@ -109,14 +109,22 @@ static void verdex_init(ram_addr_t ram_size, pxa2xx_gpio_in_get(cpu->gpio)[99]); } -QEMUMachine connex_machine = { +static QEMUMachine connex_machine = { .name = "connex", .desc = "Gumstix Connex (PXA255)", .init = connex_init, }; -QEMUMachine verdex_machine = { +static QEMUMachine verdex_machine = { .name = "verdex", .desc = "Gumstix Verdex (PXA270)", .init = verdex_init, }; + +static void gumstix_machine_init(void) +{ + qemu_register_machine(&connex_machine); + qemu_register_machine(&verdex_machine); +} + +machine_init(gumstix_machine_init); -- cgit v1.1