[03/10] vexpress: Rename machine classes to use MACHINE_TYPE_NAME

Am 19.09.2015 um 08:30 schrieb Andreas Färber:
> Am 20.08.2015 um 23:54 schrieb Eduardo Habkost:
>> 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.
>>
>> Cc: Peter Maydell <peter.maydell@linaro.org>
>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>> ---
>>  hw/arm/vexpress.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
>> index 15e4ae9..a86979d 100644
>> --- a/hw/arm/vexpress.c
>> +++ b/hw/arm/vexpress.c
>> @@ -168,8 +168,8 @@ typedef struct {
>>  } VexpressMachineState;
>>  
>>  #define TYPE_VEXPRESS_MACHINE   "vexpress"
>> -#define TYPE_VEXPRESS_A9_MACHINE   "vexpress-a9"
>> -#define TYPE_VEXPRESS_A15_MACHINE   "vexpress-a15"
>> +#define TYPE_VEXPRESS_A9_MACHINE   MACHINE_TYPE_NAME("vexpress-a9")
>> +#define TYPE_VEXPRESS_A15_MACHINE   MACHINE_TYPE_NAME("vexpress-a15")
>>  #define VEXPRESS_MACHINE(obj) \
>>      OBJECT_CHECK(VexpressMachineState, (obj), TYPE_VEXPRESS_MACHINE)
>>  #define VEXPRESS_MACHINE_GET_CLASS(obj) \
> 
> This is temporarily changing MachineClass::name to ...-machine. Fixing
> as follows, as was done for virt in 04/10:
> 
> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
> index eafa2ab..ecbfeb1 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   MACHINE_TYPE_NAME("vexpress-a9")
> -#define TYPE_VEXPRESS_A15_MACHINE   MACHINE_TYPE_NAME("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) \
> @@ -786,13 +788,13 @@ static const TypeInfo vexpress_info = {
>  };
> 
>  static const TypeInfo vexpress_a9_info = {
> -    .name = TYPE_VEXPRESS_A9_MACHINE,
> +    .name = VEXPRESS_A9_MACHINE_NAME,
>      .parent = TYPE_VEXPRESS_MACHINE,
>      .class_init = vexpress_a9_class_init,
>  };
> 
>  static const TypeInfo vexpress_a15_info = {
> -    .name = TYPE_VEXPRESS_A15_MACHINE,
> +    .name = VEXPRESS_A15_MACHINE_NAME,
>      .parent = TYPE_VEXPRESS_MACHINE,
>      .class_init = vexpress_a15_class_init,
>  };

Doh, wrong place, not my time of day...


     vmc->daughterboard = &a9_daughterboard;
@@ -771,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;
@@ -788,13 +788,13 @@ static const TypeInfo vexpress_info = {
 };

 static const TypeInfo vexpress_a9_info = {
-    .name = VEXPRESS_A9_MACHINE_NAME,
+    .name = TYPE_VEXPRESS_A9_MACHINE,
     .parent = TYPE_VEXPRESS_MACHINE,
     .class_init = vexpress_a9_class_init,
 };

 static const TypeInfo vexpress_a15_info = {
-    .name = VEXPRESS_A15_MACHINE_NAME,
+    .name = TYPE_VEXPRESS_A15_MACHINE,
     .parent = TYPE_VEXPRESS_MACHINE,
     .class_init = vexpress_a15_class_init,
 };

Andreas

> 
> To be reverted in 10/10.
> 
> Regards,
> Andreas
>