From nobody Mon Feb 9 05:44:28 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1553277717422132.1160170383872; Fri, 22 Mar 2019 11:01:57 -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 5894E2D7FD; Fri, 22 Mar 2019 18:01:55 +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 224A45D793; Fri, 22 Mar 2019 18:01:55 +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 BE59A181A86A; Fri, 22 Mar 2019 18:01:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2MI1Z5c009048 for ; Fri, 22 Mar 2019 14:01:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7089C5D9D2; Fri, 22 Mar 2019 18:01:35 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBBF15D9D5 for ; Fri, 22 Mar 2019 18:01:34 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 22 Mar 2019 19:01:03 +0100 Message-Id: <37bc5ac957d07a895a54c025589062909aa5f5fd.1553277561.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 27/29] conf: Refactor virDomainDiskDefMirrorParse 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.30]); Fri, 22 Mar 2019 18:01:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use virDomainStorageSourceParseBase and other tricks. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 52 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 40924b1d29..2514c60744 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9315,14 +9315,13 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - xmlNodePtr mirrorNode; + VIR_XPATH_NODE_AUTORESTORE(ctxt); VIR_AUTOFREE(char *) mirrorFormat =3D NULL; VIR_AUTOFREE(char *) mirrorType =3D NULL; VIR_AUTOFREE(char *) ready =3D NULL; VIR_AUTOFREE(char *) blockJob =3D NULL; - if (!(def->mirror =3D virStorageSourceNew())) - return -1; + ctxt->node =3D cur; if ((blockJob =3D virXMLPropString(cur, "job"))) { if ((def->mirrorJob =3D virDomainBlockJobTypeFromString(blockJob))= <=3D 0) { @@ -9335,35 +9334,8 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def, } if ((mirrorType =3D virXMLPropString(cur, "type"))) { - if ((def->mirror->type =3D virStorageTypeFromString(mirrorType)) <= =3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown mirror backing store type '%s'"), - mirrorType); - return -1; - } - - mirrorFormat =3D virXPathString("string(./mirror/format/@type)", c= txt); - - if (!(mirrorNode =3D virXPathNode("./mirror/source", ctxt))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("mirror requires source element")); - return -1; - } - - if (virDomainStorageSourceParse(mirrorNode, ctxt, def->mirror, - flags, xmlopt) < 0) - return -1; + mirrorFormat =3D virXPathString("string(./format/@type)", ctxt); } else { - /* For back-compat reasons, we handle a file name - * encoded as attributes, even though we prefer - * modern output in the style of backingStore */ - def->mirror->type =3D VIR_STORAGE_TYPE_FILE; - def->mirror->path =3D virXMLPropString(cur, "file"); - if (!def->mirror->path) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("mirror requires file name")); - return -1; - } if (def->mirrorJob !=3D VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) { virReportError(VIR_ERR_XML_ERROR, "%s", _("mirror without type only supported " @@ -9373,11 +9345,19 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def, mirrorFormat =3D virXMLPropString(cur, "format"); } - if (mirrorFormat) { - def->mirror->format =3D virStorageFileFormatTypeFromString(mirrorF= ormat); - if (def->mirror->format <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown mirror format value '%s'"), mirrorFo= rmat); + if (!(def->mirror =3D virDomainStorageSourceParseBase(mirrorType, mirr= orFormat, NULL))) + return -1; + + if (mirrorType) { + if (virDomainStorageSourceParse(NULL, ctxt, def->mirror, flags, xm= lopt) < 0) + return -1; + } else { + /* For back-compat reasons, we handle a file name encoded as + * attributes, even though we prefer modern output in the style of + * backingStore */ + if (!(def->mirror->path =3D virXMLPropString(cur, "file"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("mirror requires file name")); return -1; } } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list