diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-08-20 14:54:29 -0700 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-09-19 16:38:44 +0200 |
| commit | fc603d29e96a2982f1b02123f83176f00a660b40 (patch) | |
| tree | b974e3854196d9fdd3ce8b2c0da9f723657bcd96 | |
| parent | 54477b07fb81ab4a55c263f3449bc07469db30fb (diff) | |
| download | focaccia-qemu-fc603d29e96a2982f1b02123f83176f00a660b40.tar.gz focaccia-qemu-fc603d29e96a2982f1b02123f83176f00a660b40.zip | |
vexpress: Rename machine classes 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 vexpress machine classes using the MACHINE_TYPE_NAME macro. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> [AF: Introduce VEXPRESS_*_MACHINE_NAME] Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | hw/arm/vexpress.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index e7ac3a5187..2bcd312453 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -168,8 +168,10 @@ typedef struct { } VexpressMachineState; #define TYPE_VEXPRESS_MACHINE "vexpress" -#define TYPE_VEXPRESS_A9_MACHINE "vexpress-a9" -#define TYPE_VEXPRESS_A15_MACHINE "vexpress-a15" +#define VEXPRESS_A9_MACHINE_NAME "vexpress-a9" +#define VEXPRESS_A15_MACHINE_NAME "vexpress-a15" +#define TYPE_VEXPRESS_A9_MACHINE MACHINE_TYPE_NAME(VEXPRESS_A9_MACHINE_NAME) +#define TYPE_VEXPRESS_A15_MACHINE MACHINE_TYPE_NAME(VEXPRESS_A15_MACHINE_NAME) #define VEXPRESS_MACHINE(obj) \ OBJECT_CHECK(VexpressMachineState, (obj), TYPE_VEXPRESS_MACHINE) #define VEXPRESS_MACHINE_GET_CLASS(obj) \ @@ -758,7 +760,7 @@ static void vexpress_a9_class_init(ObjectClass *oc, void *data) MachineClass *mc = MACHINE_CLASS(oc); VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc); - mc->name = TYPE_VEXPRESS_A9_MACHINE; + mc->name = VEXPRESS_A9_MACHINE_NAME; mc->desc = "ARM Versatile Express for Cortex-A9"; vmc->daughterboard = &a9_daughterboard; @@ -769,7 +771,7 @@ static void vexpress_a15_class_init(ObjectClass *oc, void *data) MachineClass *mc = MACHINE_CLASS(oc); VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc); - mc->name = TYPE_VEXPRESS_A15_MACHINE; + mc->name = VEXPRESS_A15_MACHINE_NAME; mc->desc = "ARM Versatile Express for Cortex-A15"; vmc->daughterboard = &a15_daughterboard; |