From nobody Mon Feb 9 10:33:16 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 1552924597201259.6202700688573; Mon, 18 Mar 2019 08:56:37 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7005730917AB; Mon, 18 Mar 2019 15:56:35 +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 46C575D705; Mon, 18 Mar 2019 15:56:35 +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 F2051181A26F; Mon, 18 Mar 2019 15:56:34 +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 x2IFtt4v022881 for ; Mon, 18 Mar 2019 11:55:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE7921001DC8; Mon, 18 Mar 2019 15:55:55 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 470271001E7E 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:22 +0100 Message-Id: <17549af0a1d6185658f45375baa2c1413c226d1d.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 33/34] conf: Remove @seclabels from virDomainDiskSourceFormat 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 18 Mar 2019 15:56:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" All callers pass in 'true' so we can remove the parameter. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 9 ++++----- src/conf/domain_conf.h | 1 - src/conf/snapshot_conf.c | 2 +- tests/virstoragetest.c | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 105ece2b7c..d12a8dcaf9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23892,7 +23892,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf, virBufferAsprintf(&childBuf, "\n", virStorageFileFormatTypeToString(backingStore->forma= t)); - if (virDomainDiskSourceFormat(&childBuf, backingStore, 0, flags, true, + if (virDomainDiskSourceFormat(&childBuf, backingStore, 0, flags, false, true, xmlopt) < 0) return -1; @@ -23953,7 +23953,6 @@ virDomainDiskSourceFormat(virBufferPtr buf, virStorageSourcePtr src, int policy, unsigned int flags, - bool seclabels, bool attrIndex, bool backingStore, virDomainXMLOptionPtr xmlopt) @@ -23964,7 +23963,7 @@ virDomainDiskSourceFormat(virBufferPtr buf, virBufferSetChildIndent(&childBuf, buf); if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags, - seclabels, attrIndex, + true, attrIndex, policy, xmlopt) < 0) return -1; @@ -24129,7 +24128,7 @@ virDomainDiskDefFormatMirror(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); virBufferEscapeString(buf, "\n", formatStr); - if (virDomainDiskSourceFormat(buf, disk->mirror, 0, flags, true, true,= true, + if (virDomainDiskSourceFormat(buf, disk->mirror, 0, flags, true, true, xmlopt) < 0) return -1; virBufferAdjustIndent(buf, -2); @@ -24227,7 +24226,7 @@ virDomainDiskDefFormat(virBufferPtr buf, virStorageAuthDefFormat(buf, def->src->auth); if (virDomainDiskSourceFormat(buf, def->src, def->startupPolicy, - flags, true, true, true, xmlopt) < 0) + flags, true, true, xmlopt) < 0) return -1; virBufferEscapeString(buf, "\n", def->doma= in_name); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7ab7b28e4f..26c6f45685 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3016,7 +3016,6 @@ int virDomainDiskSourceFormat(virBufferPtr buf, virStorageSourcePtr src, int policy, unsigned int flags, - bool seclabels, bool attrIndex, bool backingStore, virDomainXMLOptionPtr xmlopt); diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 4cc4795cf4..da27dcc1a1 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -752,7 +752,7 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf, if (disk->src->format > 0) virBufferEscapeString(buf, "\n", virStorageFileFormatTypeToString(disk->src->= format)); - if (virDomainDiskSourceFormat(buf, disk->src, 0, 0, true, false, false= , xmlopt) < 0) + if (virDomainDiskSourceFormat(buf, disk->src, 0, 0, false, false, xmlo= pt) < 0) return -1; virBufferAdjustIndent(buf, -2); diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 9a11f5bfe8..ba97a80d45 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -657,7 +657,7 @@ testBackingParse(const void *args) goto cleanup; } - if (virDomainDiskSourceFormat(&buf, src, 0, 0, true, false, false, NUL= L) < 0 || + if (virDomainDiskSourceFormat(&buf, src, 0, 0, false, false, NULL) < 0= || !(xml =3D virBufferContentAndReset(&buf))) { fprintf(stderr, "failed to format disk source xml\n"); goto cleanup; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list