From 048aaf05ca7e94982ae5fc21fd0d288b6e62a14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Sun, 11 Mar 2018 15:17:10 -0400
Subject: [PATCH] Revert use of DEFINE_MACHINE() for registrations of multiple
 machines

The script used for converting from QEMUMachine had used one
DEFINE_MACHINE() per machine registered. In cases where multiple
machines are registered from one source file, avoid the excessive
generation of module init functions by reverting this unrolling.

Backports commit 8a661aea0e7f6e776c6ebc9abe339a85b34fea1d from qemu
---
 qemu/hw/sparc64/sun4u.c       | 26 ++++++++++++++++++++++++--
 qemu/include/hw/sparc/sparc.h |  2 +-
 qemu/target/sparc/unicorn64.c |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/qemu/hw/sparc64/sun4u.c b/qemu/hw/sparc64/sun4u.c
index e90b3cff..ec6bfdfe 100644
--- a/qemu/hw/sparc64/sun4u.c
+++ b/qemu/hw/sparc64/sun4u.c
@@ -51,12 +51,34 @@ static int sun4u_init(struct uc_struct *uc, MachineState *machine)
     return 0;
 }
 
-static void sun4u_machine_init(struct uc_struct *uc, MachineClass *mc)
+static void sun4u_class_init(struct uc_struct *uc, ObjectClass *oc, void *data)
 {
+    MachineClass *mc = MACHINE_CLASS(uc, oc);
+
     mc->init = sun4u_init;
     mc->max_cpus = 1; /* XXX for now */
     mc->is_default = 1;
     mc->arch = UC_ARCH_SPARC;
 }
 
-DEFINE_MACHINE("sun4u", sun4u_machine_init)
+static const TypeInfo sun4u_type = {
+    MACHINE_TYPE_NAME("sun4u"),
+    TYPE_MACHINE,
+
+    0,
+    0,
+    NULL,
+
+    NULL,
+    NULL,
+    NULL,
+
+    NULL,
+
+    sun4u_class_init,
+};
+
+void sun4u_machine_init(struct uc_struct *uc)
+{
+    type_register_static(uc, &sun4u_type);
+}
diff --git a/qemu/include/hw/sparc/sparc.h b/qemu/include/hw/sparc/sparc.h
index 184cb241..25bda8c9 100644
--- a/qemu/include/hw/sparc/sparc.h
+++ b/qemu/include/hw/sparc/sparc.h
@@ -3,6 +3,6 @@
 
 void sparc_cpu_register_types(void *opaque);
 void leon3_generic_machine_init_register_types(struct uc_struct *uc);
-void sun4u_machine_init_register_types(struct uc_struct *uc);
+void sun4u_machine_init(struct uc_struct *uc);
 
 #endif
diff --git a/qemu/target/sparc/unicorn64.c b/qemu/target/sparc/unicorn64.c
index bfa4c93e..9de721cb 100644
--- a/qemu/target/sparc/unicorn64.c
+++ b/qemu/target/sparc/unicorn64.c
@@ -110,7 +110,7 @@ void sparc64_uc_init(struct uc_struct* uc)
 {
     register_accel_types(uc);
     sparc_cpu_register_types(uc);
-    sun4u_machine_init_register_types(uc);
+    sun4u_machine_init(uc);
     uc->reg_read = sparc_reg_read;
     uc->reg_write = sparc_reg_write;
     uc->reg_reset = sparc_reg_reset;