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>

1 files changed, 8 insertions, 1 deletions

diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index ee733fbc23..ac0bd264ff 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -508,12 +508,19 @@ static void integratorcp_init(ram_addr_t ram_size,
     arm_load_kernel(env, &integrator_binfo);
 }
 
-QEMUMachine integratorcp_machine = {
+static QEMUMachine integratorcp_machine = {
     .name = "integratorcp",
     .desc = "ARM Integrator/CP (ARM926EJ-S)",
     .init = integratorcp_init,
 };
 
+static void integratorcp_machine_init(void)
+{
+    qemu_register_machine(&integratorcp_machine);
+}
+
+machine_init(integratorcp_machine_init);
+
 static void integratorcp_register_devices(void)
 {
     sysbus_register_dev("integrator_pic", sizeof(icp_pic_state), icp_pic_init);