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/musicpal.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'hw/musicpal.c') diff --git a/hw/musicpal.c b/hw/musicpal.c index 87dda0c..fe06586 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1596,12 +1596,19 @@ static void musicpal_init(ram_addr_t ram_size, arm_load_kernel(env, &musicpal_binfo); } -QEMUMachine musicpal_machine = { +static QEMUMachine musicpal_machine = { .name = "musicpal", .desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)", .init = musicpal_init, }; +static void musicpal_machine_init(void) +{ + qemu_register_machine(&musicpal_machine); +} + +machine_init(musicpal_machine_init); + static void musicpal_register_devices(void) { sysbus_register_dev("mv88w8618_pic", sizeof(mv88w8618_pic_state), -- cgit v1.1