From nobody Wed May 14 17:06:01 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 15209521260271017.0865129593315; Tue, 13 Mar 2018 07:42:06 -0700 (PDT) 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 5B00521BB1; Tue, 13 Mar 2018 14:42:04 +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 1FDBF600D2; Tue, 13 Mar 2018 14:42:04 +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 367374CA9D; Tue, 13 Mar 2018 14:42:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2DEcRej003444 for ; Tue, 13 Mar 2018 10:38:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id E333C2166BAE; Tue, 13 Mar 2018 14:38:26 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CF952166BDA; Tue, 13 Mar 2018 14:38:26 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 13 Mar 2018 15:37:35 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 09/10] conf: Extract parsing of storage source related data 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.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.30]); Tue, 13 Mar 2018 14:42:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Split out the parser and separate it from the private data part so that it can be later reused in other parts of the code. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d1ff80feb7..86fc275116 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8554,24 +8554,26 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, static int -virDomainDiskSourcePrivateDataParse(xmlXPathContextPtr ctxt, +virDomainDiskSourcePrivateDataParse(xmlNodePtr node, + xmlXPathContextPtr ctxt, virStorageSourcePtr src, unsigned int flags, virDomainXMLOptionPtr xmlopt) { xmlNodePtr saveNode =3D ctxt->node; - xmlNodePtr node; int ret =3D -1; if (!(flags & VIR_DOMAIN_DEF_PARSE_STATUS) || !xmlopt || !xmlopt->privateData.storageParse) return 0; - if (!(node =3D virXPathNode("./privateData", ctxt))) - return 0; - ctxt->node =3D node; + if (!(ctxt->node =3D virXPathNode("./privateData", ctxt))) { + ret =3D 0; + goto cleanup; + } + if (xmlopt->privateData.storageParse(ctxt, src) < 0) goto cleanup; @@ -8584,12 +8586,11 @@ virDomainDiskSourcePrivateDataParse(xmlXPathContext= Ptr ctxt, } -int -virDomainDiskSourceParse(xmlNodePtr node, - xmlXPathContextPtr ctxt, - virStorageSourcePtr src, - unsigned int flags, - virDomainXMLOptionPtr xmlopt) +static int +virDomainStorageSourceParse(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virStorageSourcePtr src, + unsigned int flags) { int ret =3D -1; xmlNodePtr saveNode =3D ctxt->node; @@ -8635,9 +8636,6 @@ virDomainDiskSourceParse(xmlNodePtr node, ctxt, flags) < 0) goto cleanup; - if (virDomainDiskSourcePrivateDataParse(ctxt, src, flags, xmlopt) < 0) - goto cleanup; - /* People sometimes pass a bogus '' source path when they mean to omit= the * source element completely (e.g. CDROM without media). This is just a * little compatibility check to help those broken apps */ @@ -8652,6 +8650,23 @@ virDomainDiskSourceParse(xmlNodePtr node, } +int +virDomainDiskSourceParse(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virStorageSourcePtr src, + unsigned int flags, + virDomainXMLOptionPtr xmlopt) +{ + if (virDomainStorageSourceParse(node, ctxt, src, flags) < 0) + return -1; + + if (virDomainDiskSourcePrivateDataParse(node, ctxt, src, flags, xmlopt= ) < 0) + return -1; + + return 0; +} + + static int virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt, virStorageSourcePtr src, --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list