From nobody Mon Feb 9 16:27:22 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 1553277726211350.9182481808474; Fri, 22 Mar 2019 11:02:06 -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 7454A88AB6; Fri, 22 Mar 2019 18:02:02 +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 400D25D71E; Fri, 22 Mar 2019 18:02:02 +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 E51603D391; Fri, 22 Mar 2019 18:02:01 +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 x2MI1RCX008949 for ; Fri, 22 Mar 2019 14:01:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5DB4F5D9D2; Fri, 22 Mar 2019 18:01:27 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB8B65D9D6 for ; Fri, 22 Mar 2019 18:01:24 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 22 Mar 2019 19:00:53 +0100 Message-Id: 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 17/29] conf: Use virDomainStorageSourceParseBase in virDomainDiskBackingStoreParse 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.26]); Fri, 22 Mar 2019 18:02:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9b64e33ff5..15bb00e800 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9166,31 +9166,15 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr c= txt, if (!(ctxt->node =3D virXPathNode("./backingStore", ctxt))) return 0; - if (!(backingStore =3D virStorageSourceNew())) - return -1; - - /* backing store is always read-only */ - backingStore->readonly =3D true; - /* terminator does not have a type */ if (!(type =3D virXMLPropString(ctxt->node, "type"))) { - VIR_STEAL_PTR(src->backingStore, backingStore); + if (!(src->backingStore =3D virStorageSourceNew())) + return -1; return 0; } - if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && - (idx =3D virXMLPropString(ctxt->node, "index")) && - virStrToLong_uip(idx, NULL, 10, &backingStore->id) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("invalid disk index '%s'"), id= x); - return -1; - } - - backingStore->type =3D virStorageTypeFromString(type); - if (backingStore->type <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk backing store type '%s'"), type); - return -1; - } + if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) + idx =3D virXMLPropString(ctxt->node, "index"); if (!(format =3D virXPathString("string(./format/@type)", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9198,19 +9182,18 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr c= txt, return -1; } - backingStore->format =3D virStorageFileFormatTypeFromString(format); - if (backingStore->format <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk backing store format '%s'"), format= ); - return -1; - } - if (!(source =3D virXPathNode("./source", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing disk backing store source")); return -1; } + if (!(backingStore =3D virDomainStorageSourceParseBase(type, format, i= dx))) + return -1; + + /* backing store is always read-only */ + backingStore->readonly =3D true; + if (virDomainStorageSourceParse(source, ctxt, backingStore, flags, xml= opt) < 0 || virDomainDiskBackingStoreParse(ctxt, backingStore, flags, xmlopt) = < 0) return -1; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list