From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMY-00089Z-JJ for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdJMV-0006YY-Q3 for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:40298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMV-0006YM-JN for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:35 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 16:43:13 +0200 Message-Id: <1442673810-2679-5-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 04/21] machine: MACHINE_TYPE_NAME macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost The macro will be useful to ensure the machine class names follow the right format to make machine class lookup by class name work correctly. Signed-off-by: Eduardo Habkost Reviewed-by: Marcel Apfelbaum Reviewed-by: David Gibson Signed-off-by: Andreas F=C3=A4rber --- include/hw/boards.h | 6 ++++++ vl.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 566a5ca..586f939 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -40,6 +40,12 @@ void memory_region_allocate_system_memory(MemoryRegion= *mr, Object *owner, int qemu_register_machine(QEMUMachine *m); =20 #define TYPE_MACHINE_SUFFIX "-machine" + +/* Machine class name that needs to be used for class-name-based machine + * type lookup to work. + */ +#define MACHINE_TYPE_NAME(machinename) (machinename TYPE_MACHINE_SUFFIX) + #define TYPE_MACHINE "machine" #undef MACHINE /* BSD defines it and QEMU does not use it */ #define MACHINE(obj) \ diff --git a/vl.c b/vl.c index 3c6480d..3c6c9b0 100644 --- a/vl.c +++ b/vl.c @@ -1452,7 +1452,7 @@ static void qemu_machine_class_init(ObjectClass *oc= , void *data) =20 int qemu_register_machine(QEMUMachine *m) { - char *name =3D g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL); + char *name =3D g_strdup_printf(MACHINE_TYPE_NAME("%s"), m->name); TypeInfo ti =3D { .name =3D name, .parent =3D TYPE_MACHINE, --=20 2.1.4