From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdBoV-0002Za-09 for qemu-devel@nongnu.org; Sat, 19 Sep 2015 02:39:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdBoO-0003fq-Iq for qemu-devel@nongnu.org; Sat, 19 Sep 2015 02:39:58 -0400 Received: from mx2.suse.de ([195.135.220.15]:46196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdBoO-0003fb-CH for qemu-devel@nongnu.org; Sat, 19 Sep 2015 02:39:52 -0400 References: <1440107676-17326-1-git-send-email-ehabkost@redhat.com> <1440107676-17326-11-git-send-email-ehabkost@redhat.com> <55FCFF66.8070609@suse.de> From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Message-ID: <55FD0336.1060808@suse.de> Date: Sat, 19 Sep 2015 08:39:50 +0200 MIME-Version: 1.0 In-Reply-To: <55FCFF66.8070609@suse.de> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 10/10] machine: Set MachineClass::name automatically List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Marcel Apfelbaum , David Gibson Am 19.09.2015 um 08:23 schrieb Andreas F=E4rber: > 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 =3D MACHINE_CLASS(oc); >> =20 >> - mc->name =3D VIRT_MACHINE_NAME; >> mc->desc =3D "ARM Virtual Machine", >> mc->init =3D machvirt_init; >> mc->max_cpus =3D 8; >=20 > I am going to squash the following cleanup reverting 04/10 change: >=20 > 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; >=20 > -#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) \ >=20 > Regards, > Andreas >=20 --=20 SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Felix Imend=F6rffer, Jane Smithard, Graham Norton; HRB 21284 (AG N=FC= rnberg)