From nobody Sun Feb 8 19:59:39 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=1555344172; cv=none; d=zoho.com; s=zohoarc; b=lmAroidHYi4uIZg4lyOnSsb1RuYDPPQE82bSGreNwHYvD0cb6+AFHjPNSPc/C2TBbv2J5jI+V1UgPz0P5SbjeHkru9tW0DwH7Uio8xZbBly5LzPQgD5dkyDaSktf+/NYjZDWJPveyYtKhSiEQ/4W5AyEBixonnKf5EXzr5EAhWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555344172; 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=oFcvOeCch/cnH38QCQOocQqZj7VzvWqpUB8/GHOOQDQ=; b=iMhmzLo9jW1epTvPnFEBsvm7oQBMFQWo8KwbLFjfBrZdXyjiyKzfeu+yrLpMVW/OhHDCDgEV1PhvoQk8kKDFOKDdV0xSi4958T0jLBTNMK+210eFKEnHEF84DBRwYaVPwZV5raNXJgwyDF9FWWB+qBr7KgaRLTehuNYTh4LQbe4= 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 1555344172711838.2546456487476; Mon, 15 Apr 2019 09:02:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B43153003BE1; Mon, 15 Apr 2019 16:02:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E85F1001DE8; Mon, 15 Apr 2019 16:02:48 +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 459CC3FA4B; Mon, 15 Apr 2019 16:02:48 +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 x3FG2O9r003165 for ; Mon, 15 Apr 2019 12:02:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3C58A1001E75; Mon, 15 Apr 2019 16:02:24 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8FC51001E89 for ; Mon, 15 Apr 2019 16:02:23 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 15 Apr 2019 18:02:01 +0200 Message-Id: <4e88bc69be2d8700717cf555524c4c6f7cd746d5.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 08/21] qemu: qapi: Separate virQEMUQAPISchemaTraverse into functions by object type 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 15 Apr 2019 16:02:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Simplify virQEMUQAPISchemaTraverse by separating out the necessary operations for given 'meta-type' into separate functions. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_qapi.c | 117 ++++++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 39 deletions(-) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 2652061f4e..5995e5006e 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -105,68 +105,107 @@ static int virQEMUQAPISchemaTraverse(const char *baseName, char **query, virHashTablePtr schema, - virJSONValuePtr *type) + virJSONValuePtr *type); + + +static int +virQEMUQAPISchemaTraverseObject(virJSONValuePtr cur, + char **query, + virHashTablePtr schema, + virJSONValuePtr *type) { - virJSONValuePtr curtype; virJSONValuePtr obj; - const char *metatype; const char *querytype =3D NULL; - const char *querystr; - char modifier; + const char *querystr =3D *query; + char modifier =3D *querystr; + + if (!c_isalpha(modifier)) + querystr++; + + if (modifier =3D=3D '+') { + querytype =3D virQEMUQAPISchemaObjectGetType("variants", + querystr, + "case", cur); + } else { + obj =3D virQEMUQAPISchemaObjectGet("members", querystr, "name", cu= r); + + if (modifier =3D=3D '*' && + !virJSONValueObjectHasKey(obj, "default")) + return 0; + + querytype =3D virQEMUQAPISchemaTypeFromObject(obj); + } - if (!(curtype =3D virHashLookup(schema, baseName))) + return virQEMUQAPISchemaTraverse(querytype, query + 1, schema, type); +} + + +static int +virQEMUQAPISchemaTraverseArray(virJSONValuePtr cur, + char **query, + virHashTablePtr schema, + virJSONValuePtr *type) +{ + const char *querytype; + + /* arrays are just flattened by default */ + if (!(querytype =3D virJSONValueObjectGetString(cur, "element-type"))) + return 0; + + return virQEMUQAPISchemaTraverse(querytype, query, schema, type); +} + + +static int +virQEMUQAPISchemaTraverseCommand(virJSONValuePtr cur, + char **query, + virHashTablePtr schema, + virJSONValuePtr *type) +{ + const char *querytype; + + if (!(querytype =3D virJSONValueObjectGetString(cur, *query))) + return 0; + + return virQEMUQAPISchemaTraverse(querytype, query + 1, schema, type); +} + + +static int +virQEMUQAPISchemaTraverse(const char *baseName, + char **query, + virHashTablePtr schema, + virJSONValuePtr *type) +{ + virJSONValuePtr cur; + const char *metatype; + + if (!(cur =3D virHashLookup(schema, baseName))) return 0; if (!*query) { if (type) - *type =3D curtype; + *type =3D cur; return 1; } - if (!(metatype =3D virJSONValueObjectGetString(curtype, "meta-type"))) + if (!(metatype =3D virJSONValueObjectGetString(cur, "meta-type"))) return 0; - /* flatten arrays by default */ if (STREQ(metatype, "array")) { - if (!(querytype =3D virJSONValueObjectGetString(curtype, "element-= type"))) - return 0; + return virQEMUQAPISchemaTraverseArray(cur, query, schema, type); } else if (STREQ(metatype, "object")) { - querystr =3D *query; - modifier =3D **query; - - if (!c_isalpha(modifier)) - querystr++; - - if (modifier =3D=3D '+') { - querytype =3D virQEMUQAPISchemaObjectGetType("variants", - querystr, - "case", curtype); - } else { - obj =3D virQEMUQAPISchemaObjectGet("members", querystr, - "name", curtype); - - if (modifier =3D=3D '*' && - !virJSONValueObjectHasKey(obj, "default")) - return 0; - - querytype =3D virQEMUQAPISchemaTypeFromObject(obj); - } - query++; + return virQEMUQAPISchemaTraverseObject(cur, query, schema, type); } else if (STREQ(metatype, "command") || STREQ(metatype, "event")) { - if (!(querytype =3D virJSONValueObjectGetString(curtype, *query))) - return 0; - query++; + return virQEMUQAPISchemaTraverseCommand(cur, query, schema, type); } else { /* alternates, basic types and enums can't be entered */ return 0; } - if (!querytype) - return 0; - - return virQEMUQAPISchemaTraverse(querytype, query, schema, type); + return 0; } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list