summaryrefslogtreecommitdiff
path: root/hw/omap_sx1.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-05-20 18:38:09 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-05-21 08:47:55 -0500
commitf80f9ec9a63bb2200d614feb658a77b78f9a4bba (patch)
tree59e22e0a617e392a65431b82256fb443aa6ad850 /hw/omap_sx1.c
parentf92f8afebe038a4eae9ad90a140c9529f94919a6 (diff)
downloadqemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.tar.gz
qemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.tar.bz2
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/omap_sx1.c')
-rw-r--r--hw/omap_sx1.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 5a538833d1..ee8e39d7cd 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -223,14 +223,22 @@ static void sx1_init_v2(ram_addr_t ram_size,
kernel_cmdline, initrd_filename, cpu_model, 2);
}
-QEMUMachine sx1_machine_v2 = {
+static QEMUMachine sx1_machine_v2 = {
.name = "sx1",
.desc = "Siemens SX1 (OMAP310) V2",
.init = sx1_init_v2,
};
-QEMUMachine sx1_machine_v1 = {
+static QEMUMachine sx1_machine_v1 = {
.name = "sx1-v1",
.desc = "Siemens SX1 (OMAP310) V1",
.init = sx1_init_v1,
};
+
+static void sx1_machine_init(void)
+{
+ qemu_register_machine(&sx1_machine_v2);
+ qemu_register_machine(&sx1_machine_v1);
+}
+
+machine_init(sx1_machine_init);