From nobody Wed May 14 16:50:05 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 1520952112630687.9750974265439; Tue, 13 Mar 2018 07:41:52 -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 21D0562E9D; Tue, 13 Mar 2018 14:41:51 +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 8ADF817D79; Tue, 13 Mar 2018 14:41:50 +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 10BA9181B9FE; Tue, 13 Mar 2018 14:41:49 +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 w2DEcMwl003388 for ; Tue, 13 Mar 2018 10:38:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 977BC2166BB2; Tue, 13 Mar 2018 14:38:22 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20FA72166BDA; Tue, 13 Mar 2018 14:38:22 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 13 Mar 2018 15:37:29 +0100 Message-Id: <127fc1843286b007a6719d2dc347dce0596f54f5.1520951803.git.pkrempa@redhat.com> 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 03/10] conf: Remove virDomainDiskSourceDefFormatSeclabel 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.39]); Tue, 13 Mar 2018 14:41:51 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The wrapper functionality can be moved to the only user virDomainDiskSourceFormatInternal. Also removes comment which does not reflect the truth any more. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ebe1172fd2..4aa66fe09c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22704,33 +22704,16 @@ virDomainDiskBlockIoDefFormat(virBufferPtr buf, } -/* virDomainSourceDefFormatSeclabel: - * - * This function automatically closes the element and formats any - * possible seclabels. - */ -static void -virDomainDiskSourceDefFormatSeclabel(virBufferPtr buf, - size_t nseclabels, - virSecurityDeviceLabelDefPtr *seclabe= ls, - unsigned int flags, - bool skipSeclables) -{ - size_t n; - - if (nseclabels && !skipSeclables) { - for (n =3D 0; n < nseclabels; n++) - virSecurityDeviceLabelDefFormat(buf, seclabels[n], flags); - } -} - static void virDomainSourceDefFormatSeclabel(virBufferPtr buf, size_t nseclabels, virSecurityDeviceLabelDefPtr *seclabels, unsigned int flags) { - virDomainDiskSourceDefFormatSeclabel(buf, nseclabels, seclabels, flags= , false); + size_t n; + + for (n =3D 0; n < nseclabels; n++) + virSecurityDeviceLabelDefFormat(buf, seclabels[n], flags); } @@ -22875,9 +22858,9 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf, } if (src->type !=3D VIR_STORAGE_TYPE_NETWORK) { - virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels, - src->seclabels, flags, - skipSeclabels); + if (!skipSeclabels) + virDomainSourceDefFormatSeclabel(&childBuf, src->nseclabels, + src->seclabels, flags); } /* Storage Source formatting will not carry through the blunder --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list