From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkAq0-0007ZU-1R for qemu-devel@nongnu.org; Thu, 08 Oct 2015 09:02:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZkApt-0007AI-2Z for qemu-devel@nongnu.org; Thu, 08 Oct 2015 09:02:23 -0400 From: Markus Armbruster Date: Thu, 8 Oct 2015 15:02:09 +0200 Message-Id: <1444309331-17927-10-git-send-email-armbru@redhat.com> In-Reply-To: <1444309331-17927-1-git-send-email-armbru@redhat.com> References: <1444309331-17927-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] [PULL v2 09/11] qmp: Fix device-list-properties not to crash for abstract device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Broken in commit f4eb32b "qmp: show QOM properties in device-list-properties", v2.1. Cc: qemu-stable@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Andreas F=C3=A4rber Message-Id: <1443689999-12182-9-git-send-email-armbru@redhat.com> --- qmp.c | 6 ++++++ tests/device-introspect-test.c | 15 ++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/qmp.c b/qmp.c index 057a7cb..1413de4 100644 --- a/qmp.c +++ b/qmp.c @@ -515,6 +515,12 @@ DevicePropertyInfoList *qmp_device_list_properties(c= onst char *typename, return NULL; } =20 + if (object_class_is_abstract(klass)) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "name", + "non-abstract device type"); + return NULL; + } + obj =3D object_new(typename); =20 QTAILQ_FOREACH(prop, &obj->properties, node) { diff --git a/tests/device-introspect-test.c b/tests/device-introspect-tes= t.c index f240b5c..8a27b4a 100644 --- a/tests/device-introspect-test.c +++ b/tests/device-introspect-test.c @@ -45,17 +45,10 @@ static void test_one_device(const char *type) QDict *resp; char *help, *qom_tree; =20 - /* - * Skip this part for the abstract device test case, because - * device-list-properties crashes for such devices. - * FIXME fix it not to crash - */ - if (strcmp(type, "device")) { - resp =3D qmp("{'execute': 'device-list-properties'," - " 'arguments': {'typename': %s}}", - type); - QDECREF(resp); - } + resp =3D qmp("{'execute': 'device-list-properties'," + " 'arguments': {'typename': %s}}", + type); + QDECREF(resp); =20 help =3D hmp("device_add \"%s,help\"", type); g_free(help); --=20 2.4.3