From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dknmP-0003PS-4L for qemu-devel@nongnu.org; Thu, 24 Aug 2017 04:46:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dknmN-0000PQ-ML for qemu-devel@nongnu.org; Thu, 24 Aug 2017 04:46:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53590) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dknmN-0000Om-HK for qemu-devel@nongnu.org; Thu, 24 Aug 2017 04:46:19 -0400 From: Markus Armbruster Date: Thu, 24 Aug 2017 10:46:11 +0200 Message-Id: <1503564371-26090-17-git-send-email-armbru@redhat.com> In-Reply-To: <1503564371-26090-1-git-send-email-armbru@redhat.com> References: <1503564371-26090-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 16/16] qapi: drop the sentinel in enum array List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com From: Marc-Andr=C3=A9 Lureau Now that all usages have been converted to user lookup helpers. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20170822132255.23945-14-marcandre.lureau@redhat.com> [Rebased, superfluous local variable dropped, missing check-qom-proplist.c update added] Signed-off-by: Markus Armbruster --- block/parallels.c | 1 - scripts/qapi.py | 4 +--- tests/check-qom-proplist.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index cce7336..2b6c6e5 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -72,7 +72,6 @@ static QEnumLookup prealloc_mode_lookup =3D { .array =3D (const char *const[]) { "falloc", "truncate", - NULL, }, .size =3D PRL_PREALLOC_MODE__MAX }; diff --git a/scripts/qapi.py b/scripts/qapi.py index 61be538..a0993ee 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1860,14 +1860,12 @@ const QEnumLookup %(c_name)s_lookup =3D { ''', index=3Dindex, value=3Dvalue) =20 - max_index =3D c_enum_const(name, '_MAX', prefix) ret +=3D mcgen(''' - [%(max_index)s] =3D NULL, }, .size =3D %(max_index)s }; ''', - max_index=3Dmax_index) + max_index=3Dc_enum_const(name, '_MAX', prefix)) return ret =20 =20 diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c index 07e351f..92898e1 100644 --- a/tests/check-qom-proplist.c +++ b/tests/check-qom-proplist.c @@ -51,7 +51,6 @@ const QEnumLookup dummy_animal_map =3D { [DUMMY_FROG] =3D "frog", [DUMMY_ALLIGATOR] =3D "alligator", [DUMMY_PLATYPUS] =3D "platypus", - [DUMMY_LAST] =3D NULL, }, .size =3D DUMMY_LAST }; --=20 2.7.5