Re: [Qemu-devel] [PATCH 10/10] machine: Set MachineClass::name automatically

[Andreas Färber]

Am 19.09.2015 um 08:23 schrieb Andreas Färber:
> Am 20.08.2015 um 23:54 schrieb Eduardo Habkost:
>> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
>> index 5ba4b80..af985f6 100644
>> --- a/hw/arm/virt.c
>> +++ b/hw/arm/virt.c
>> @@ -960,7 +960,6 @@ static void virt_class_init(ObjectClass *oc, void *data)
>>  {
>>      MachineClass *mc = MACHINE_CLASS(oc);
>>  
>> -    mc->name = VIRT_MACHINE_NAME;
>>      mc->desc = "ARM Virtual Machine",
>>      mc->init = machvirt_init;
>>      mc->max_cpus = 8;
> 
> I am going to squash the following cleanup reverting 04/10 change:
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 49eb4fa..6bf0d6d 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -83,8 +83,7 @@ typedef struct {
>      bool highmem;
>  } VirtMachineState;
> 
> -#define VIRT_MACHINE_NAME   "virt"
> -#define TYPE_VIRT_MACHINE   MACHINE_TYPE_NAME(VIRT_MACHINE_NAME)
> +#define TYPE_VIRT_MACHINE   MACHINE_TYPE_NAME("virt")
>  #define VIRT_MACHINE(obj) \
>      OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE)
>  #define VIRT_MACHINE_GET_CLASS(obj) \

And for my corresponding 03/10 change:

diff --cc hw/arm/vexpress.c
index 2bcd312,f8c46aa..0000000
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@@ -168,10 -168,10 +168,8 @@@ typedef struct
  } VexpressMachineState;

  #define TYPE_VEXPRESS_MACHINE   "vexpress"
--#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 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) \

> 
> Regards,
> Andreas
> 


-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)