From nobody Sun May 11 05:33:58 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1534324756713735.8539214936012; Wed, 15 Aug 2018 02:19:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA02EC004EBA; Wed, 15 Aug 2018 09:19:14 +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 7D4DA308BDA7; Wed, 15 Aug 2018 09:19:14 +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 24BB618037F1; Wed, 15 Aug 2018 09:19:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7F9ItU8020002 for ; Wed, 15 Aug 2018 05:18:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 19AB510EE961; Wed, 15 Aug 2018 09:18:55 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC19D10EE964 for ; Wed, 15 Aug 2018 09:18:54 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 15 Aug 2018 11:18:40 +0200 Message-Id: <4db5c226b167d90d2367ec407cecec54cf181520.1534324576.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 03/10] qemu: qapi: Allow selecting specifically optional schema entries in virQEMUQAPISchemaTraverse 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 15 Aug 2018 09:19:15 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add a new modifier character which will select given schema entry only when it is optional. Signed-off-by: Peter Krempa Reviewed-by: John Ferlan --- src/qemu/qemu_qapi.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index cd28c69a96..070379b335 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -105,6 +105,7 @@ virQEMUQAPISchemaTraverse(const char *baseName, virHashTablePtr schema) { virJSONValuePtr base; + virJSONValuePtr obj; const char *metatype; const char *querystr; char modifier; @@ -132,14 +133,20 @@ virQEMUQAPISchemaTraverse(const char *baseName, if (!c_isalpha(modifier)) querystr++; - if (modifier =3D=3D '+') + if (modifier =3D=3D '+') { baseName =3D virQEMUQAPISchemaObjectGetType("variants", querystr, "case", base); - else - baseName =3D virQEMUQAPISchemaObjectGetType("members", - querystr, - "name", base); + } else { + obj =3D virQEMUQAPISchemaObjectGet("members", querystr, + "name", base); + + if (modifier =3D=3D '*' && + !virJSONValueObjectHasKey(obj, "default")) + return NULL; + + baseName =3D virQEMUQAPISchemaTypeFromObject(obj); + } if (!baseName) return NULL; @@ -175,6 +182,7 @@ virQEMUQAPISchemaTraverse(const char *baseName, * attribute: selects whether arguments or return type should be introspec= ted * ("arg-type" or "ret-type" for commands, "arg-type" for event= s) * subattribute: specifies member name of object types + * *subattribute: same as above but must be optional * +variant_discriminator: In the case of unionized objects, select a * specific case to introspect. * --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list