Use DEFINE_MACHINE() to register all machines

[mirror_qemu.git] / hw / arm / palm.c

diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 1f84dbff18b00438a9635f8e7a1481f9482ae60c..82ec99d936ab4d75bda7b287c788ffa8797e3d46 100644 (file)
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -269,15 +269,10 @@ static void palmte_init(MachineState *machine)
     arm_load_kernel(mpu->cpu, &palmte_binfo);
 }
 
-static QEMUMachine palmte_machine = {
-    .name = "cheetah",
-    .desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
-    .init = palmte_init,
-};
-
-static void palmte_machine_init(void)
+static void palmte_machine_init(MachineClass *mc)
 {
-    qemu_register_machine(&palmte_machine);
+    mc->desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)";
+    mc->init = palmte_init;
 }
 
-machine_init(palmte_machine_init);
+DEFINE_MACHINE("cheetah", palmte_machine_init)