From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 20 Aug 2015 21:54:30 +0000 (-0700)
Subject: arm: Rename virt machine class to use MACHINE_TYPE_NAME
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=64d3459c8586c8821970cbc99450340278507cfe;p=qemu.git

arm: Rename virt machine class to use MACHINE_TYPE_NAME

Machine class names should use the "-machine" suffix to allow
class-name-based machine class lookup to work. Rename the arm virt
machine class using the MACHINE_TYPE_NAME macro.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index e9324f56bd..fba259529b 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -83,7 +83,8 @@ typedef struct {
     bool highmem;
 } VirtMachineState;
 
-#define TYPE_VIRT_MACHINE   "virt"
+#define VIRT_MACHINE_NAME   "virt"
+#define TYPE_VIRT_MACHINE   MACHINE_TYPE_NAME(VIRT_MACHINE_NAME)
 #define VIRT_MACHINE(obj) \
     OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE)
 #define VIRT_MACHINE_GET_CLASS(obj) \
@@ -1073,7 +1074,7 @@ static void virt_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);
 
-    mc->name = TYPE_VIRT_MACHINE;
+    mc->name = VIRT_MACHINE_NAME;
     mc->desc = "ARM Virtual Machine",
     mc->init = machvirt_init;
     mc->max_cpus = 8;