From nobody Sun Feb 8 23:41:50 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 1552924594635853.6227501278577; Mon, 18 Mar 2019 08:56:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C566AC04BD54; Mon, 18 Mar 2019 15:56:32 +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 8DF586013A; Mon, 18 Mar 2019 15:56:32 +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 4C029181A26E; Mon, 18 Mar 2019 15:56:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2IFtuBV022893 for ; Mon, 18 Mar 2019 11:55:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 954E4101960C; Mon, 18 Mar 2019 15:55:56 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19B471001E84 for ; Mon, 18 Mar 2019 15:55:55 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 18 Mar 2019 16:55:23 +0100 Message-Id: <4f1df1d3ba7260b673c487d1d86e229191c148b2.1552924270.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 34/34] conf: Remove @seclabels from virDomainStorageSourceFormat 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 18 Mar 2019 15:56:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" All callers now pass true so we can remove the argument. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d12a8dcaf9..51bacfdd82 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23758,7 +23758,6 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr b= uf, * @childBuf: buffer for subelements of the formatted element * @src: storage source to format * @flags: XML formatter flags - * @seclabels: security labels are formatted if true * @attrIndex: the 'index' attribute is formatted if true * @policy: startup policy, taken from disk (use 0 to omit) * @xmlopt: XML options data (for private data formatters) @@ -23774,7 +23773,6 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf, virBufferPtr childBuf, virStorageSourcePtr src, unsigned int flags, - bool seclabels, bool attrIndex, int policy, virDomainXMLOptionPtr xmlopt) @@ -23817,7 +23815,7 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf, return -1; } - if (seclabels && src->type !=3D VIR_STORAGE_TYPE_NETWORK) + if (src->type !=3D VIR_STORAGE_TYPE_NETWORK) virDomainSourceDefFormatSeclabel(childBuf, src->nseclabels, src->seclabels, flags); @@ -23934,7 +23932,7 @@ virDomainStorageSourceFormatFull(virBufferPtr buf, virStorageFileFormatTypeToString(src->format)); if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags, - true, true, 0, xmlopt) < 0) + true, 0, xmlopt) < 0) return -1; if (virXMLFormatElement(buf, elemname, &attrBuf, &childBuf) < 0) @@ -23963,8 +23961,7 @@ virDomainDiskSourceFormat(virBufferPtr buf, virBufferSetChildIndent(&childBuf, buf); if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags, - true, attrIndex, - policy, xmlopt) < 0) + attrIndex, policy, xmlopt) < 0) return -1; if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list