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/versatilepb.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'hw/versatilepb.c') diff --git a/hw/versatilepb.c b/hw/versatilepb.c index ecbd3bf2e3..5ae57e329d 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -309,20 +309,28 @@ static void vab_init(ram_addr_t ram_size, initrd_filename, cpu_model, 0x25e); } -QEMUMachine versatilepb_machine = { +static QEMUMachine versatilepb_machine = { .name = "versatilepb", .desc = "ARM Versatile/PB (ARM926EJ-S)", .init = vpb_init, .use_scsi = 1, }; -QEMUMachine versatileab_machine = { +static QEMUMachine versatileab_machine = { .name = "versatileab", .desc = "ARM Versatile/AB (ARM926EJ-S)", .init = vab_init, .use_scsi = 1, }; +static void versatile_machine_init(void) +{ + qemu_register_machine(&versatilepb_machine); + qemu_register_machine(&versatileab_machine); +} + +machine_init(versatile_machine_init); + static void versatilepb_register_devices(void) { sysbus_register_dev("versatilepb_sic", sizeof(vpb_sic_state), -- cgit v1.2.3