uninorth: add to bridge category

[qemu.git] / hw / sh4 / r2d.c

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 481bd927bd5ddfb7e088c86c6f2bfe9e3e30126a..c1ff9a0cff0aaf368cb4cd3d819e936b229528ab 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -354,15 +354,10 @@ static void r2d_init(MachineState *machine)
                        SDRAM_BASE + BOOT_PARAMS_OFFSET);
 }
 
                        SDRAM_BASE + BOOT_PARAMS_OFFSET);
 }
 

-static QEMUMachine r2d_machine = {
-    .name = "r2d",
-    .desc = "r2d-plus board",
-    .init = r2d_init,
-};
-
-static void r2d_machine_init(void)
+static void r2d_machine_init(MachineClass *mc)

 {
 {

-    qemu_register_machine(&r2d_machine);
+    mc->desc = "r2d-plus board";
+    mc->init = r2d_init;

 }
 
 }
 

-machine_init(r2d_machine_init);
+DEFINE_MACHINE("r2d", r2d_machine_init)