aboutsummaryrefslogtreecommitdiff
path: root/hw/nseries.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/nseries.c
parentf92f8afebe038a4eae9ad90a140c9529f94919a6 (diff)
downloadqemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.zip
qemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.tar.gz
qemu-f80f9ec9a63bb2200d614feb658a77b78f9a4bba.tar.bz2
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/nseries.c')
-rw-r--r--hw/nseries.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/hw/nseries.c b/hw/nseries.c
index daf1b8b..c219bfe 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -1403,14 +1403,22 @@ static void n810_init(ram_addr_t ram_size,
cpu_model, &n810_binfo, 810);
}
-QEMUMachine n800_machine = {
+static QEMUMachine n800_machine = {
.name = "n800",
.desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
.init = n800_init,
};
-QEMUMachine n810_machine = {
+static QEMUMachine n810_machine = {
.name = "n810",
.desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
.init = n810_init,
};
+
+static void nseries_machine_init(void)
+{
+ qemu_register_machine(&n800_machine);
+ qemu_register_machine(&n810_machine);
+}
+
+machine_init(nseries_machine_init);