From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMY-00089d-K8 for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdJMW-0006Z0-G1 for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:40301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMW-0006YU-AJ for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:36 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 16:43:15 +0200 Message-Id: <1442673810-2679-7-git-send-email-afaerber@suse.de> In-Reply-To: <1442673810-2679-1-git-send-email-afaerber@suse.de> References: <1442673810-2679-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 06/21] vexpress: Rename machine classes to use MACHINE_TYPE_NAME List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: 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. Signed-off-by: Eduardo Habkost Reviewed-by: David Gibson [AF: Introduce VEXPRESS_*_MACHINE_NAME] Signed-off-by: Andreas F=C3=A4rber --- hw/arm/vexpress.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index e7ac3a5..2bcd312 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 "vexpress-a9" -#define TYPE_VEXPRESS_A15_MACHINE "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_MACHI= NE_NAME) #define VEXPRESS_MACHINE(obj) \ OBJECT_CHECK(VexpressMachineState, (obj), TYPE_VEXPRESS_MACHINE) #define VEXPRESS_MACHINE_GET_CLASS(obj) \ @@ -758,7 +760,7 @@ static void vexpress_a9_class_init(ObjectClass *oc, v= oid *data) MachineClass *mc =3D MACHINE_CLASS(oc); VexpressMachineClass *vmc =3D VEXPRESS_MACHINE_CLASS(oc); =20 - mc->name =3D TYPE_VEXPRESS_A9_MACHINE; + mc->name =3D VEXPRESS_A9_MACHINE_NAME; mc->desc =3D "ARM Versatile Express for Cortex-A9"; =20 vmc->daughterboard =3D &a9_daughterboard; @@ -769,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); =20 - mc->name =3D TYPE_VEXPRESS_A15_MACHINE; + mc->name =3D VEXPRESS_A15_MACHINE_NAME; mc->desc =3D "ARM Versatile Express for Cortex-A15"; =20 vmc->daughterboard =3D &a15_daughterboard; --=20 2.1.4