From nobody Mon Feb 9 21:37:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500318201755539.1728655841732; Mon, 17 Jul 2017 12:03:21 -0700 (PDT) Received: from localhost ([::1]:52088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXBIb-0005sb-CB for importer@patchew.org; Mon, 17 Jul 2017 15:03:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXB75-0003UN-HI for qemu-devel@nongnu.org; Mon, 17 Jul 2017 14:51:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXB74-0003vM-EA for qemu-devel@nongnu.org; Mon, 17 Jul 2017 14:51:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dXB74-0003uG-5w for qemu-devel@nongnu.org; Mon, 17 Jul 2017 14:51:22 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 21CC14ACCC; Mon, 17 Jul 2017 18:51:21 +0000 (UTC) Received: from localhost (ovpn-116-61.gru2.redhat.com [10.97.116.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81C4460464; Mon, 17 Jul 2017 18:51:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 21CC14ACCC Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 21CC14ACCC From: Eduardo Habkost To: Peter Maydell Date: Mon, 17 Jul 2017 15:50:50 -0300 Message-Id: <20170717185051.18740-15-ehabkost@redhat.com> In-Reply-To: <20170717185051.18740-1-ehabkost@redhat.com> References: <20170717185051.18740-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 17 Jul 2017 18:51:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 14/15] qmp: Include 'abstract' field on 'qom-list-types' output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" A client may be interested in getting the list of both abstract and non-abstract types. Instead of requiring them to make multiple queries with different filter arguments, just return an 'abstract' field in 'qom-list-types'. In addition to the new test code for validating this field, update the abstract-interfaces test case to query for all 'interface' subtypes (including abstract ones), and to look at the 'abstract' field directly. Reviewed-by: Eric Blake Signed-off-by: Eduardo Habkost Message-Id: <20170707122215.8819-3-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- qapi-schema.json | 5 +++- qmp.c | 1 + tests/device-introspect-test.c | 53 +++++++++++++++++++++++++++++++-------= ---- 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index ab438ea..6486690 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3051,10 +3051,13 @@ # # @name: the type name found in the search # +# @abstract: the type is abstract and can't be directly instantiated. +# Omitted if false. (since 2.10) +# # Since: 1.1 ## { 'struct': 'ObjectTypeInfo', - 'data': { 'name': 'str' } } + 'data': { 'name': 'str', '*abstract': 'bool' } } =20 ## # @qom-list-types: diff --git a/qmp.c b/qmp.c index 2cd40c3..7a9de06 100644 --- a/qmp.c +++ b/qmp.c @@ -433,6 +433,7 @@ static void qom_list_types_tramp(ObjectClass *klass, vo= id *data) =20 info =3D g_malloc0(sizeof(*info)); info->name =3D g_strdup(object_class_get_name(klass)); + info->has_abstract =3D info->abstract =3D object_class_is_abstract(kla= ss); =20 e =3D g_malloc0(sizeof(*e)); e->value =3D info; diff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c index f1e6ddd..78d4811 100644 --- a/tests/device-introspect-test.c +++ b/tests/device-introspect-test.c @@ -103,6 +103,33 @@ static void test_device_intro_list(void) qtest_end(); } =20 +static void test_qom_list_fields(void) +{ + QList *all_types; + QList *non_abstract; + QListEntry *e; + + qtest_start(common_args); + + all_types =3D qom_list_types(NULL, true); + non_abstract =3D qom_list_types(NULL, false); + + QLIST_FOREACH_ENTRY(all_types, e) { + QDict *d =3D qobject_to_qdict(qlist_entry_obj(e)); + const char *name =3D qdict_get_str(d, "name"); + bool abstract =3D qdict_haskey(d, "abstract") ? + qdict_get_bool(d, "abstract") : + false; + bool expected_abstract =3D !type_list_find(non_abstract, name); + + g_assert(abstract =3D=3D expected_abstract); + } + + QDECREF(all_types); + QDECREF(non_abstract); + qtest_end(); +} + static void test_device_intro_none(void) { qtest_start(common_args); @@ -144,25 +171,24 @@ static void test_abstract_interfaces(void) QListEntry *e; =20 qtest_start(common_args); - /* qom-list-types implements=3Dinterface would return any type - * that implements _any_ interface (not just interface types), - * so use a trick to find the interface type names: - * - list all object types - * - list all types, and look for items that are not - * on the first list + /* + * qom-list-types implements=3Dinterface returns all types that + * implement _any_ interface (not just interface types), but + * we can filter them out because interfaces don't implement + * the "object" type. */ - all_types =3D qom_list_types(NULL, false); - obj_types =3D qom_list_types("object", false); + all_types =3D qom_list_types("interface", true); + obj_types =3D qom_list_types("object", true); =20 QLIST_FOREACH_ENTRY(all_types, e) { QDict *d =3D qobject_to_qdict(qlist_entry_obj(e)); =20 - /* - * An interface (incorrectly) marked as non-abstract would - * appear on all_types, but not on obj_types: - */ - g_assert(type_list_find(obj_types, qdict_get_str(d, "name"))); + if (type_list_find(obj_types, qdict_get_str(d, "name"))) { + /* Not an interface type */ + continue; + } =20 + g_assert(qdict_haskey(d, "abstract") && qdict_get_bool(d, "abstrac= t")); } =20 QDECREF(all_types); @@ -175,6 +201,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); =20 qtest_add_func("device/introspect/list", test_device_intro_list); + qtest_add_func("device/introspect/list-fields", test_qom_list_fields); qtest_add_func("device/introspect/none", test_device_intro_none); qtest_add_func("device/introspect/abstract", test_device_intro_abstrac= t); qtest_add_func("device/introspect/concrete", test_device_intro_concret= e); --=20 2.9.4