summaryrefslogtreecommitdiffstats
path: root/hw/ppc405_boards.c
diff options
context:
space:
mode:
authorAnthony Liguori2009-05-21 01:38:09 +0200
committerAnthony Liguori2009-05-21 15:47:55 +0200
commitf80f9ec9a63bb2200d614feb658a77b78f9a4bba (patch)
tree59e22e0a617e392a65431b82256fb443aa6ad850 /hw/ppc405_boards.c
parentEliminate --disable-gfx-check and make VNC default when SDL not available (diff)
downloadqemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.tar.gz
qemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.tar.xz
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/ppc405_boards.c')
-rw-r--r--hw/ppc405_boards.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 0b4eb9333e..1ace32e6f7 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -344,7 +344,7 @@ static void ref405ep_init (ram_addr_t ram_size,
printf("bdloc %016lx\n", (unsigned long)bdloc);
}
-QEMUMachine ref405ep_machine = {
+static QEMUMachine ref405ep_machine = {
.name = "ref405ep",
.desc = "ref405ep",
.init = ref405ep_init,
@@ -624,8 +624,16 @@ static void taihu_405ep_init(ram_addr_t ram_size,
#endif
}
-QEMUMachine taihu_machine = {
+static QEMUMachine taihu_machine = {
.name = "taihu",
.desc = "taihu",
.init = taihu_405ep_init,
};
+
+static void ppc405_machine_init(void)
+{
+ qemu_register_machine(&ref405ep_machine);
+ qemu_register_machine(&taihu_machine);
+}
+
+machine_init(ppc405_machine_init);