From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdBm8-0001YO-GM for qemu-devel@nongnu.org; Sat, 19 Sep 2015 02:37:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdBm5-0003G7-9J for qemu-devel@nongnu.org; Sat, 19 Sep 2015 02:37:32 -0400 Received: from mx2.suse.de ([195.135.220.15]:46116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdBm4-0003G3-V5 for qemu-devel@nongnu.org; Sat, 19 Sep 2015 02:37:29 -0400 References: <1440107676-17326-1-git-send-email-ehabkost@redhat.com> <1440107676-17326-4-git-send-email-ehabkost@redhat.com> <55FD00FF.4060305@suse.de> From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Message-ID: <55FD02A7.1090509@suse.de> Date: Sat, 19 Sep 2015 08:37:27 +0200 MIME-Version: 1.0 In-Reply-To: <55FD00FF.4060305@suse.de> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 03/10] vexpress: Rename machine classes to use MACHINE_TYPE_NAME List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Peter Maydell , Marcel Apfelbaum , David Gibson Am 19.09.2015 um 08:30 schrieb Andreas F=E4rber: > 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 >> Signed-off-by: Eduardo Habkost >> --- >> 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; >> =20 >> #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) \ >=20 > This is temporarily changing MachineClass::name to ...-machine. Fixing > as follows, as was done for virt in 04/10: >=20 > 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; >=20 > #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 =3D { > }; >=20 > static const TypeInfo vexpress_a9_info =3D { > - .name =3D TYPE_VEXPRESS_A9_MACHINE, > + .name =3D VEXPRESS_A9_MACHINE_NAME, > .parent =3D TYPE_VEXPRESS_MACHINE, > .class_init =3D vexpress_a9_class_init, > }; >=20 > static const TypeInfo vexpress_a15_info =3D { > - .name =3D TYPE_VEXPRESS_A15_MACHINE, > + .name =3D VEXPRESS_A15_MACHINE_NAME, > .parent =3D TYPE_VEXPRESS_MACHINE, > .class_init =3D 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 =3D MACHINE_CLASS(oc); VexpressMachineClass *vmc =3D VEXPRESS_MACHINE_CLASS(oc); - mc->name =3D TYPE_VEXPRESS_A9_MACHINE; + mc->name =3D VEXPRESS_A9_MACHINE_NAME; mc->desc =3D "ARM Versatile Express for Cortex-A9"; vmc->daughterboard =3D &a9_daughterboard; @@ -771,7 +771,7 @@ static void vexpress_a15_class_init(ObjectClass *oc, void *data) MachineClass *mc =3D MACHINE_CLASS(oc); VexpressMachineClass *vmc =3D VEXPRESS_MACHINE_CLASS(oc); - mc->name =3D TYPE_VEXPRESS_A15_MACHINE; + mc->name =3D VEXPRESS_A15_MACHINE_NAME; mc->desc =3D "ARM Versatile Express for Cortex-A15"; vmc->daughterboard =3D &a15_daughterboard; @@ -788,13 +788,13 @@ static const TypeInfo vexpress_info =3D { }; static const TypeInfo vexpress_a9_info =3D { - .name =3D VEXPRESS_A9_MACHINE_NAME, + .name =3D TYPE_VEXPRESS_A9_MACHINE, .parent =3D TYPE_VEXPRESS_MACHINE, .class_init =3D vexpress_a9_class_init, }; static const TypeInfo vexpress_a15_info =3D { - .name =3D VEXPRESS_A15_MACHINE_NAME, + .name =3D TYPE_VEXPRESS_A15_MACHINE, .parent =3D TYPE_VEXPRESS_MACHINE, .class_init =3D vexpress_a15_class_init, }; Andreas >=20 > To be reverted in 10/10. >=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)