summary refs log tree commit diff stats
path: root/hw/arm/virt.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2015-08-20 14:54:36 -0700
committerAndreas Färber <afaerber@suse.de>2015-09-19 16:39:28 +0200
commit98cec76a7076c4a38e16f1a9de170a7942b3be54 (patch)
tree22f0ef15c6c434a10033aeaf77717851e4fc3127 /hw/arm/virt.c
parentdcb3d601115eed77aef543fe3a920adc17544e06 (diff)
downloadfocaccia-qemu-98cec76a7076c4a38e16f1a9de170a7942b3be54.tar.gz
focaccia-qemu-98cec76a7076c4a38e16f1a9de170a7942b3be54.zip
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>
Diffstat (limited to 'hw/arm/virt.c')
-rw-r--r--hw/arm/virt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index fba259529b..6bf0d6d591 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -83,8 +83,7 @@ typedef struct {
     bool highmem;
 } VirtMachineState;
 
-#define VIRT_MACHINE_NAME   "virt"
-#define TYPE_VIRT_MACHINE   MACHINE_TYPE_NAME(VIRT_MACHINE_NAME)
+#define TYPE_VIRT_MACHINE   MACHINE_TYPE_NAME("virt")
 #define VIRT_MACHINE(obj) \
     OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE)
 #define VIRT_MACHINE_GET_CLASS(obj) \
@@ -1074,7 +1073,6 @@ static void virt_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);
 
-    mc->name = VIRT_MACHINE_NAME;
     mc->desc = "ARM Virtual Machine",
     mc->init = machvirt_init;
     mc->max_cpus = 8;