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/etraxfs.c b/hw/etraxfs.c
index 9cdf41cb32..27205ad579 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -158,8 +158,15 @@ void bareetraxfs_init (ram_addr_t ram_size,
     printf ("ram size =%ld\n", ram_size);
 }
 
-QEMUMachine bareetraxfs_machine = {
+static QEMUMachine bareetraxfs_machine = {
     .name = "bareetraxfs",
     .desc = "Bare ETRAX FS board",
     .init = bareetraxfs_init,
 };
+
+static void bareetraxfs_machine_init(void)
+{
+    qemu_register_machine(&bareetraxfs_machine);
+}
+
+machine_init(bareetraxfs_machine_init);