commit 98cec76a7076c4a38e16f1a9de170a7942b3be54
author Eduardo Habkost <ehabkost@redhat.com> Thu Aug 20 14:54:36 2015 -0700
committer Andreas Färber <afaerber@suse.de> Sat Sep 19 16:39:28 2015 +0200
tree 22f0ef15c6c434a10033aeaf77717851e4fc3127
parent dcb3d601115eed77aef543fe3a920adc17544e06

machine: Set MachineClass::name automatically

Now all TYPE_MACHINE subclasses use MACHINE_TYPE_NAME to generate the
class name. So instead of requiring each subclass to set
MachineClass::name manually, we can now set it automatically at the
TYPE_MACHINE class_base_init() function.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
[AF/ehabkost: Updated for s390-ccw machines]
[AF: Cleanup of intermediate virt and vexpress name handling]
Signed-off-by: Andreas Färber <afaerber@suse.de>

hw/core/machine.c

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 3c1f248..f4db340 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -319,8 +319,11 @@
 static void machine_class_base_init(ObjectClass *oc, void *data)
 {
     if (!object_class_is_abstract(oc)) {
+        MachineClass *mc = MACHINE_CLASS(oc);
         const char *cname = object_class_get_name(oc);
         assert(g_str_has_suffix(cname, TYPE_MACHINE_SUFFIX));
+        mc->name = g_strndup(cname,
+                            strlen(cname) - strlen(TYPE_MACHINE_SUFFIX));
     }
 }