From nobody Sun Feb 8 19:56:42 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=1555344182; cv=none; d=zoho.com; s=zohoarc; b=XG1wV3gQEG9SsjEeiK7ZrJuBTKYdpxOffqtL6t+gK4qJxtvVNNTq0eNsDayfKqq/YjRtIji1FMbY6Au1yUgLp7JKcBQq+Djb5L+8AgODoffvKoNeYNtF7EEmmxg13PoWxWT9BCOSLtCd9CFjYXnMzlFD3URO8UZK/4iO7BBg9B8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555344182; 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=R+zIQwFw/0rLrg5ccGiMAIjwX8yDorw688exdyS7xW0=; b=mqFNgeNTF5MxRsqrYM2MRucZdiKyGLMl12si4ha2j1TzCWy7i6+6lEXcJKc4fzYDc8PsbPLd3ekwYuz/BfdQV3pb72WWhIg4+NkZaDF7Ld/4hZyHTTYD6JmmTkYsrcEa5DXmnSTpJRvd48CTbpvt1cQHBck9Cbo5XJ0ZDpauDqM= 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 1555344182461259.08297203907557; Mon, 15 Apr 2019 09:03:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AE43CC069B2C; Mon, 15 Apr 2019 16:03:00 +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 8BDF95D9E1; Mon, 15 Apr 2019 16:03:00 +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 45A2D181AC90; Mon, 15 Apr 2019 16:03:00 +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 x3FG2Rpi003332 for ; Mon, 15 Apr 2019 12:02:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7979310A33C1; Mon, 15 Apr 2019 16:02:27 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 011111001E89 for ; Mon, 15 Apr 2019 16:02:26 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 15 Apr 2019 18:02:05 +0200 Message-Id: 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 12/21] qemu: qapi: Add helpers for virQEMUQAPISchemaTraverseContext 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 15 Apr 2019 16:03:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Rather than modifying the context struct add a helpers that does this. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_qapi.c | 46 +++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index ed2a4992ab..a03aab7f9b 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -71,11 +71,38 @@ virQEMUQAPISchemaObjectGet(const char *field, struct virQEMUQAPISchemaTraverseContext { virHashTablePtr schema; - char **query; + char **queries; virJSONValuePtr returnType; }; +static void +virQEMUQAPISchemaTraverseContextInit(struct virQEMUQAPISchemaTraverseConte= xt *ctxt, + char **queries, + virHashTablePtr schema) +{ + memset(ctxt, 0, sizeof(*ctxt)); + ctxt->schema =3D schema; + ctxt->queries =3D queries; +} + + +static const char * +virQEMUQAPISchemaTraverseContextNextQuery(struct virQEMUQAPISchemaTraverse= Context *ctxt) +{ + const char *query =3D ctxt->queries[0]; + ctxt->queries++; + return query; +} + + +static bool +virQEMUQAPISchemaTraverseContextHasNextQuery(struct virQEMUQAPISchemaTrave= rseContext *ctxt) +{ + return !!ctxt->queries[0]; +} + + static int virQEMUQAPISchemaTraverse(const char *baseName, struct virQEMUQAPISchemaTraverseContext *ctxt); @@ -86,7 +113,7 @@ virQEMUQAPISchemaTraverseObject(virJSONValuePtr cur, struct virQEMUQAPISchemaTraverseContext *c= txt) { virJSONValuePtr obj; - const char *query =3D *ctxt->query; + const char *query =3D virQEMUQAPISchemaTraverseContextNextQuery(ctxt); char modifier =3D *query; if (!c_isalpha(modifier)) @@ -105,8 +132,6 @@ virQEMUQAPISchemaTraverseObject(virJSONValuePtr cur, if (!obj) return 0; - ctxt->query++; - return virQEMUQAPISchemaTraverse(virJSONValueObjectGetString(obj, "typ= e"), ctxt); } @@ -129,13 +154,12 @@ static int virQEMUQAPISchemaTraverseCommand(virJSONValuePtr cur, struct virQEMUQAPISchemaTraverseContext *= ctxt) { + const char *query =3D virQEMUQAPISchemaTraverseContextNextQuery(ctxt); const char *querytype; - if (!(querytype =3D virJSONValueObjectGetString(cur, *ctxt->query))) + if (!(querytype =3D virJSONValueObjectGetString(cur, query))) return 0; - ctxt->query++; - return virQEMUQAPISchemaTraverse(querytype, ctxt); } @@ -150,7 +174,7 @@ virQEMUQAPISchemaTraverse(const char *baseName, if (!(cur =3D virHashLookup(ctxt->schema, baseName))) return 0; - if (!ctxt->query[0]) { + if (!virQEMUQAPISchemaTraverseContextHasNextQuery(ctxt)) { ctxt->returnType =3D cur; return 1; } @@ -214,7 +238,7 @@ virQEMUQAPISchemaPathGet(const char *query, virJSONValuePtr *entry) { VIR_AUTOSTRINGLIST elems =3D NULL; - struct virQEMUQAPISchemaTraverseContext ctxt =3D { .schema =3D schema = }; + struct virQEMUQAPISchemaTraverseContext ctxt; int rc; if (entry) @@ -228,9 +252,9 @@ virQEMUQAPISchemaPathGet(const char *query, return -1; } - ctxt.query =3D elems + 1; + virQEMUQAPISchemaTraverseContextInit(&ctxt, elems, schema); - rc =3D virQEMUQAPISchemaTraverse(elems[0], &ctxt); + rc =3D virQEMUQAPISchemaTraverse(virQEMUQAPISchemaTraverseContextNextQ= uery(&ctxt), &ctxt); if (entry) *entry =3D ctxt.returnType; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list