From nobody Wed May 14 16:45:26 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 1520951906885155.83978844995124; Tue, 13 Mar 2018 07:38:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 880DBC05004D; Tue, 13 Mar 2018 14:38:25 +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 40EA560BEF; Tue, 13 Mar 2018 14:38:25 +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 D7C304CA99; Tue, 13 Mar 2018 14:38:24 +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 w2DEcLR3003376 for ; Tue, 13 Mar 2018 10:38:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id DB5552166BB2; Tue, 13 Mar 2018 14:38:21 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 660142166BDA; Tue, 13 Mar 2018 14:38:21 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 13 Mar 2018 15:37:28 +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 02/10] conf: Refactor seclabel formatting in virDomainDiskSourceFormatInternal 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 13 Mar 2018 14:38:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Call the formatter function only once. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ddabc77a9b..ebe1172fd2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22836,19 +22836,11 @@ virDomainDiskSourceFormatInternal(virBufferPtr bu= f, case VIR_STORAGE_TYPE_FILE: virBufferEscapeString(&attrBuf, " file=3D'%s'", src->path); virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", startupPo= licy); - - virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels, - src->seclabels, flags, - skipSeclabels); break; case VIR_STORAGE_TYPE_BLOCK: virBufferEscapeString(&attrBuf, " dev=3D'%s'", src->path); virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", startupPo= licy); - - virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels, - src->seclabels, flags, - skipSeclabels); break; case VIR_STORAGE_TYPE_DIR: @@ -22873,9 +22865,6 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf, } virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", startupPo= licy); - virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels, - src->seclabels, flags, - skipSeclabels); break; case VIR_STORAGE_TYPE_NONE: @@ -22885,6 +22874,12 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf, goto error; } + if (src->type !=3D VIR_STORAGE_TYPE_NETWORK) { + virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels, + src->seclabels, flags, + skipSeclabels); + } + /* Storage Source formatting will not carry through the blunder * that disk source formatting had at one time to format the * for a volume source type. The information is --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list