From nobody Sun Feb 8 17:13:15 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 1533650145617764.160740259483; Tue, 7 Aug 2018 06:55:45 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 20D08550CC; Tue, 7 Aug 2018 13:55:43 +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 E187160F90; Tue, 7 Aug 2018 13:55:42 +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 937663FCC1; Tue, 7 Aug 2018 13:55:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w77DtXQr006408 for ; Tue, 7 Aug 2018 09:55:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id C7A932026D76; Tue, 7 Aug 2018 13:55:33 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F3772026D66 for ; Tue, 7 Aug 2018 13:55:33 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Tue, 7 Aug 2018 15:55:24 +0200 Message-Id: <2496d08273bc15d383710cce4a264ce46feaca1f.1533650092.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/9] conf: use virStorageSourceInitiator functions 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 07 Aug 2018 13:55:43 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: J=EF=BF=BDn Tomko --- src/conf/storage_conf.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index a0c92af820..50dbc937e7 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -380,7 +380,7 @@ virStoragePoolSourceClear(virStoragePoolSourcePtr sourc= e) VIR_FREE(source->dir); VIR_FREE(source->name); virStorageAdapterClear(&source->adapter); - VIR_FREE(source->initiator.iqn); + virStorageSourceInitiatorClear(&source->initiator); virStorageAuthDefFree(source->auth); VIR_FREE(source->vendor); VIR_FREE(source->product); @@ -488,7 +488,8 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, } =20 VIR_FREE(nodeset); - source->initiator.iqn =3D virXPathString("string(./initiator/iqn/@name= )", ctxt); + + virStorageSourceInitiatorParseXML(ctxt, &source->initiator); =20 nsource =3D virXPathNodeSet("./device", ctxt, &nodeset); if (nsource < 0) @@ -950,15 +951,8 @@ virStoragePoolSourceFormat(virBufferPtr buf, if (options->flags & VIR_STORAGE_POOL_SOURCE_NAME) virBufferEscapeString(buf, "%s\n", src->name); =20 - if ((options->flags & VIR_STORAGE_POOL_SOURCE_INITIATOR_IQN) && - src->initiator.iqn) { - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); - virBufferEscapeString(buf, "\n", - src->initiator.iqn); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - } + if (options->flags & VIR_STORAGE_POOL_SOURCE_INITIATOR_IQN) + virStorageSourceInitiatorFormatXML(&src->initiator, buf); =20 if (options->formatToString) { const char *format =3D (options->formatToString)(src->format); --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list