From nobody Sat Feb 7 07:11:20 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.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; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1493229190571893.6753050876594; Wed, 26 Apr 2017 10:53:10 -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 3E6F2342C66; Wed, 26 Apr 2017 17:53:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A3D2D1869E; Wed, 26 Apr 2017 17:53:07 +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 D01955EC6C; Wed, 26 Apr 2017 17:53:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v3QHqu7a008998 for ; Wed, 26 Apr 2017 13:52:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id EB7F08062B; Wed, 26 Apr 2017 17:52:56 +0000 (UTC) Received: from angien.brq.redhat.com (dhcp129-47.brq.redhat.com [10.34.129.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EFA58062A; Wed, 26 Apr 2017 17:52:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 3E6F2342C66 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 3E6F2342C66 From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 26 Apr 2017 19:52:38 +0200 Message-Id: <611f2eff20c5818bbc7ce94daae88b6e28d7747f.1493229124.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 08/14] conf: Extract formatting of network disk source into separate function 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 26 Apr 2017 17:53:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Reviewed-by: Jiri Denemark --- src/conf/domain_conf.c | 99 ++++++++++++++++++++++++++--------------------= ---- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 61006dea7..5a736c853 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20767,6 +20767,56 @@ virDomainSourceDefFormatSeclabel(virBufferPtr buf, virDomainDiskSourceDefFormatSeclabel(buf, nseclabels, seclabels, flags= , false); } + +static int +virDomainDiskSourceFormatNetwork(virBufferPtr buf, + virStorageSourcePtr src) +{ + size_t n; + char *path =3D NULL; + + virBufferAsprintf(buf, "protocol)); + + if (src->volume) { + if (virAsprintf(&path, "%s%s", src->volume, src->path) < 0) + return -1; + } + + virBufferEscapeString(buf, " name=3D'%s'", path ? path : src->path); + + VIR_FREE(path); + + if (src->nhosts =3D=3D 0 && !src->snapshot && !src->configFile) { + virBufferAddLit(buf, "/>\n"); + } else { + virBufferAddLit(buf, ">\n"); + virBufferAdjustIndent(buf, 2); + + for (n =3D 0; n < src->nhosts; n++) { + virBufferAddLit(buf, "hosts[n].name); + virBufferEscapeString(buf, " port=3D'%s'", src->hosts[n].port); + + if (src->hosts[n].transport) + virBufferAsprintf(buf, " transport=3D'%s'", + virStorageNetHostTransportTypeToString(s= rc->hosts[n].transport)); + + virBufferEscapeString(buf, " socket=3D'%s'", src->hosts[n].soc= ket); + virBufferAddLit(buf, "/>\n"); + } + + virBufferEscapeString(buf, "\n", src->snaps= hot); + virBufferEscapeString(buf, "\n", src->configF= ile); + + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + } + + return 0; +} + + static int virDomainDiskSourceFormatInternal(virBufferPtr buf, virStorageSourcePtr src, @@ -20774,8 +20824,6 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf, unsigned int flags, bool skipSeclabels) { - size_t n; - char *path =3D NULL; const char *startupPolicy =3D NULL; if (policy) @@ -20811,51 +20859,8 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf, break; case VIR_STORAGE_TYPE_NETWORK: - virBufferAsprintf(buf, "proto= col)); - - - if (src->volume) { - if (virAsprintf(&path, "%s%s", src->volume, src->path) < 0) - return -1; - } - - virBufferEscapeString(buf, " name=3D'%s'", path ? path : src->= path); - - VIR_FREE(path); - - if (src->nhosts =3D=3D 0 && !src->snapshot && !src->configFile= ) { - virBufferAddLit(buf, "/>\n"); - } else { - virBufferAddLit(buf, ">\n"); - virBufferAdjustIndent(buf, 2); - - for (n =3D 0; n < src->nhosts; n++) { - virBufferAddLit(buf, "hosts[n].name); - virBufferEscapeString(buf, " port=3D'%s'", - src->hosts[n].port); - - if (src->hosts[n].transport) - virBufferAsprintf(buf, " transport=3D'%s'", - virStorageNetHostTransportTypeTo= String(src->hosts[n].transport)); - - virBufferEscapeString(buf, " socket=3D'%s'", - src->hosts[n].socket); - - virBufferAddLit(buf, "/>\n"); - } - - virBufferEscapeString(buf, "\n", - src->snapshot); - - virBufferEscapeString(buf, "\n", - src->configFile); - - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - } + if (virDomainDiskSourceFormatNetwork(buf, src) < 0) + return -1; break; case VIR_STORAGE_TYPE_VOLUME: --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list