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) \ Regards, Andreas -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)