[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 03/10] vexpress: Rename machine classes to use M
From: |
Andreas Färber |
Subject: |
Re: [Qemu-devel] [PATCH 03/10] vexpress: Rename machine classes to use MACHINE_TYPE_NAME |
Date: |
Sat, 19 Sep 2015 08:37:27 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 |
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 <address@hidden>
>> Signed-off-by: Eduardo Habkost <address@hidden>
>> ---
>> 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...
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index ecbfeb1..2bcd312 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -760,7 +760,7 @@ static void vexpress_a9_class_init(ObjectClass *oc,
void *da
ta)
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;
@@ -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
>
--
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)