diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-05-20 18:38:09 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-05-21 08:47:55 -0500 |
| commit | f80f9ec9a63bb2200d614feb658a77b78f9a4bba (patch) | |
| tree | 59e22e0a617e392a65431b82256fb443aa6ad850 /hw/musicpal.c | |
| parent | f92f8afebe038a4eae9ad90a140c9529f94919a6 (diff) | |
| download | qemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.tar.gz qemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.tar.bz2 qemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.zip | |
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 <aliguori@us.ibm.com>
Diffstat (limited to 'hw/musicpal.c')
| -rw-r--r-- | hw/musicpal.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/musicpal.c b/hw/musicpal.c index 87dda0ce5c..fe065866e2 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), |