[04/10] arm: Rename virt machine class to use MACHINE_TYPE_NAME
diff mbox

Message ID 1440107676-17326-5-git-send-email-ehabkost@redhat.com
State New
Headers show

Commit Message

Eduardo Habkost Aug. 20, 2015, 9:54 p.m. UTC
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.

Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/arm/virt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

David Gibson Aug. 30, 2015, 6:43 a.m. UTC | #1
On Thu, Aug 20, 2015 at 02:54:30PM -0700, Eduardo Habkost wrote:
> 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.
> 
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

Patch
diff mbox

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index d5a8417..5ba4b80 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -81,7 +81,8 @@  typedef struct {
     bool secure;
 } 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) \
@@ -959,7 +960,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;