commit f80f9ec9a63bb2200d614feb658a77b78f9a4bba
author Anthony Liguori <aliguori@us.ibm.com> Wed May 20 18:38:09 2009 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Thu May 21 08:47:55 2009 -0500
tree 59e22e0a617e392a65431b82256fb443aa6ad850
parent f92f8afebe038a4eae9ad90a140c9529f94919a6

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>

hw/ppc405_boards.c

diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 0b4eb93..1ace32e 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -344,7 +344,7 @@
     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 @@
 #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);