From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMa-0008Bl-Cf for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdJMZ-0006bP-GN for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:40 -0400 Received: from mx2.suse.de ([195.135.220.15]:40330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMZ-0006ZW-Af for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:39 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 16:43:21 +0200 Message-Id: <1442673810-2679-13-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 12/21] machine: Ensure all TYPE_MACHINE subclasses have the right suffix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost Now that all non-abstract TYPE_MACHINE subclasses have the -machine suffix, add an assert to ensure this will be always true. Signed-off-by: Eduardo Habkost Reviewed-by: Marcel Apfelbaum Signed-off-by: Andreas F=C3=A4rber --- hw/core/machine.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index 51ed6b2..3c1f248 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -316,6 +316,14 @@ static void machine_class_init(ObjectClass *oc, void= *data) mc->default_ram_size =3D 128 * M_BYTE; } =20 +static void machine_class_base_init(ObjectClass *oc, void *data) +{ + if (!object_class_is_abstract(oc)) { + const char *cname =3D object_class_get_name(oc); + assert(g_str_has_suffix(cname, TYPE_MACHINE_SUFFIX)); + } +} + static void machine_initfn(Object *obj) { MachineState *ms =3D MACHINE(obj); @@ -492,6 +500,7 @@ static const TypeInfo machine_info =3D { .abstract =3D true, .class_size =3D sizeof(MachineClass), .class_init =3D machine_class_init, + .class_base_init =3D machine_class_base_init, .instance_size =3D sizeof(MachineState), .instance_init =3D machine_initfn, .instance_finalize =3D machine_finalize, --=20 2.1.4