Commit fc603d29 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Andreas Färber
Browse files

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: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
[AF: Introduce VEXPRESS_*_MACHINE_NAME]
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 54477b07

hw/arm/vexpress.c

+6 −4
Original line number Diff line number Diff line
@@ -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;