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/ppc_oldworld.c

diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index a822bfe..c6ec635 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -381,9 +381,16 @@
     qemu_register_boot_set(fw_cfg_boot_set, fw_cfg);
 }
 
-QEMUMachine heathrow_machine = {
+static QEMUMachine heathrow_machine = {
     .name = "g3beige",
     .desc = "Heathrow based PowerMAC",
     .init = ppc_heathrow_init,
     .max_cpus = MAX_CPUS,
 };
+
+static void heathrow_machine_init(void)
+{
+    qemu_register_machine(&heathrow_machine);
+}
+
+machine_init(heathrow_machine_init);