From nobody Mon Feb 9 17:08:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1555344190; cv=none; d=zoho.com; s=zohoarc; b=WImP2JiE94bACTitEeEhyb4l+HHAzuRcFz+yJza7a7rGEcrlJ+/sR7MO2CMkkzXartjDDIU7Cd0hEAhV9Pm/rBg0kybmshdvOKAiZDZXHIQULe5BxOA5gdfOK8rlllZkkfJ4QV+/h6WMqsiEfPpXc1ZEYyD2cKizArWzOMLlu+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555344190; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=arlCDOCu+cdruunxzDTKKDFSMPqIShS0XhR6D8haUrU=; b=FKq/p/kf0D/J08OABZvAOSSPfU4Lu5z4sRN6zIO+CYEgxIXSA0FuIf+OCY3yXcUQVLPmn7gT0TCjBTg2aLNgOTbdV5rLIv4HDXQiehU65bNyLkyaa/YpydfohJIhHD8X4E4Ea0hCjhdfIbaGtriDk/H8NDgD3HJfStMTKkaYmZA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1555344190867861.5309448029527; Mon, 15 Apr 2019 09:03:10 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B7F0581E15; Mon, 15 Apr 2019 16:03:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 80C9E5D71C; Mon, 15 Apr 2019 16:03:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 27711181B9F1; Mon, 15 Apr 2019 16:03:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3FG2VFO003511 for ; Mon, 15 Apr 2019 12:02:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 860861001E89; Mon, 15 Apr 2019 16:02:31 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EB331001947 for ; Mon, 15 Apr 2019 16:02:30 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 15 Apr 2019 18:02:10 +0200 Message-Id: <3c6d14af002b1b62501d0985d86be602ee745d3c.1555344008.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 17/21] qemu: qapi: Implement worker for introspecting builtin types X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 15 Apr 2019 16:03:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_qapi.c | 31 ++++++++++++++++++++++++++++++- tests/qemumonitorjsontest.c | 2 ++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 8a695e022d..d401e9a303 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -121,7 +121,7 @@ virQEMUQAPISchemaTraverseObject(virJSONValuePtr cur, query++; /* exit on modifers for other types */ - if (modifier =3D=3D '^') + if (modifier =3D=3D '^' || modifier =3D=3D '!') return 0; if (modifier =3D=3D '+') { @@ -203,6 +203,31 @@ virQEMUQAPISchemaTraverseEnum(virJSONValuePtr cur, } +static int +virQEMUQAPISchemaTraverseBuiltin(virJSONValuePtr cur, + struct virQEMUQAPISchemaTraverseContext *= ctxt) +{ + const char *query =3D virQEMUQAPISchemaTraverseContextNextQuery(ctxt); + const char *jsontype; + + if (query[0] !=3D '!') + return 0; + + if (virQEMUQAPISchemaTraverseContextHasNextQuery(ctxt)) + return -3; + + query++; + + if (!(jsontype =3D virJSONValueObjectGetString(cur, "json-type"))) + return -1; + + if (STREQ(jsontype, query)) + return 1; + + return 0; +} + + /* The function must return 1 on successful query, 0 if the query was not = found * -1 when a libvirt error is reported, -2 if the schema is invalid and -3= if * the query component is malformed. */ @@ -221,6 +246,7 @@ static const struct virQEMUQAPISchemaTraverseMetaType t= raverseMetaType[] =3D { { "command", virQEMUQAPISchemaTraverseCommand }, { "event", virQEMUQAPISchemaTraverseCommand }, { "enum", virQEMUQAPISchemaTraverseEnum }, + { "builtin", virQEMUQAPISchemaTraverseBuiltin }, }; @@ -280,6 +306,9 @@ virQEMUQAPISchemaTraverse(const char *baseName, * * - Boolean queries - @entry remains NULL, return value indicates success: * '^enumval': returns true if the previously selected enum contains 'en= umval' + * '!basictype': returns true if previously selected type is of 'basicty= pe' + * JSON type. Spported are 'null', 'string', 'number', 'va= lue', + * 'int' and 'boolean. * * If the name of any (sub)attribute starts with non-alphabetical symbols = it * needs to be prefixed by a single space. diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 1c8ecead98..ece42aee0b 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -3094,12 +3094,14 @@ mymain(void) DO_TEST_QAPI_QUERY("variant", "blockdev-add/arg-type/+file", 1, true); DO_TEST_QAPI_QUERY("variant property", "blockdev-add/arg-type/+file/fi= lename", 1, true); DO_TEST_QAPI_QUERY("enum value", "query-status/ret-type/status/^debug"= , 1, false); + DO_TEST_QAPI_QUERY("builtin type", "query-qmp-schema/ret-type/name/!st= ring", 1, false); DO_TEST_QAPI_QUERY("nonexistent command", "nonexistent", 0, false); DO_TEST_QAPI_QUERY("nonexistent attr", "screendump/arg-type/nonexisten= t", 0, false); DO_TEST_QAPI_QUERY("nonexistent variant", "blockdev-add/arg-type/+none= xistent", 0, false); DO_TEST_QAPI_QUERY("nonexistent enum value", "query-status/ret-type/st= atus/^nonexistentdebug", 0, false); DO_TEST_QAPI_QUERY("broken query for enum value", "query-status/ret-ty= pe/status/^debug/test", -1, false); + DO_TEST_QAPI_QUERY("builtin type", "query-qmp-schema/ret-type/name/!nu= mber", 0, false); #undef DO_TEST_QAPI_QUERY --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list