From nobody Mon Feb 9 09:15:41 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 155327771096658.83556199405291; Fri, 22 Mar 2019 11:01:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 178823007C3A; Fri, 22 Mar 2019 18:01:49 +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 BE09E60BFB; Fri, 22 Mar 2019 18:01:48 +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 6551D181A852; Fri, 22 Mar 2019 18:01:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2MI1Mst008902 for ; Fri, 22 Mar 2019 14:01:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id F27975D9D5; Fri, 22 Mar 2019 18:01:21 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B51A5D9CC for ; Fri, 22 Mar 2019 18:01:21 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 22 Mar 2019 19:00:49 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 13/29] conf: Merge virDomainStorageSourceFormat into 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 22 Mar 2019 18:01:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" There was only one caller, remove the unnecessary wrapper. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 60 ++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 89e2900df2..db02005f5b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23716,38 +23716,45 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr= buf, } -static int -virDomainStorageSourceFormat(virBufferPtr attrBuf, - virBufferPtr childBuf, - virStorageSourcePtr src, - unsigned int flags) +int +virDomainDiskSourceFormat(virBufferPtr buf, + virStorageSourcePtr src, + int policy, + bool attrIndex, + unsigned int flags, + virDomainXMLOptionPtr xmlopt) { + VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + + virBufferSetChildIndent(&childBuf, buf); + switch ((virStorageType)src->type) { case VIR_STORAGE_TYPE_FILE: - virBufferEscapeString(attrBuf, " file=3D'%s'", src->path); + virBufferEscapeString(&attrBuf, " file=3D'%s'", src->path); break; case VIR_STORAGE_TYPE_BLOCK: - virBufferEscapeString(attrBuf, " dev=3D'%s'", src->path); + virBufferEscapeString(&attrBuf, " dev=3D'%s'", src->path); break; case VIR_STORAGE_TYPE_DIR: - virBufferEscapeString(attrBuf, " dir=3D'%s'", src->path); + virBufferEscapeString(&attrBuf, " dir=3D'%s'", src->path); break; case VIR_STORAGE_TYPE_NETWORK: - if (virDomainDiskSourceFormatNetwork(attrBuf, childBuf, + if (virDomainDiskSourceFormatNetwork(&attrBuf, &childBuf, src, flags) < 0) return -1; break; case VIR_STORAGE_TYPE_VOLUME: if (src->srcpool) { - virBufferEscapeString(attrBuf, " pool=3D'%s'", src->srcpool->p= ool); - virBufferEscapeString(attrBuf, " volume=3D'%s'", + virBufferEscapeString(&attrBuf, " pool=3D'%s'", src->srcpool->= pool); + virBufferEscapeString(&attrBuf, " volume=3D'%s'", src->srcpool->volume); if (src->srcpool->mode) - virBufferAsprintf(attrBuf, " mode=3D'%s'", + virBufferAsprintf(&attrBuf, " mode=3D'%s'", virStorageSourcePoolModeTypeToString(src= ->srcpool->mode)); } @@ -23761,7 +23768,7 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf, } if (src->type !=3D VIR_STORAGE_TYPE_NETWORK) - virDomainSourceDefFormatSeclabel(childBuf, src->nseclabels, + virDomainSourceDefFormatSeclabel(&childBuf, src->nseclabels, src->seclabels, flags); /* Storage Source formatting will not carry through the blunder @@ -23771,38 +23778,17 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf, * So avoid formatting it for volumes. */ if (src->auth && src->authInherited && src->type !=3D VIR_STORAGE_TYPE_VOLUME) - virStorageAuthDefFormat(childBuf, src->auth); + virStorageAuthDefFormat(&childBuf, src->auth); /* If we found encryption as a child of , then format it * as we found it. */ if (src->encryption && src->encryptionInherited && - virStorageEncryptionFormat(childBuf, src->encryption) < 0) + virStorageEncryptionFormat(&childBuf, src->encryption) < 0) return -1; if (src->pr) - virStoragePRDefFormat(childBuf, src->pr, + virStoragePRDefFormat(&childBuf, src->pr, flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE); - - return 0; -} - - -int -virDomainDiskSourceFormat(virBufferPtr buf, - virStorageSourcePtr src, - int policy, - bool attrIndex, - unsigned int flags, - virDomainXMLOptionPtr xmlopt) -{ - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - - virBufferSetChildIndent(&childBuf, buf); - - if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags) < 0) - return -1; - if (policy && src->type !=3D VIR_STORAGE_TYPE_NETWORK) virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", virDomainStartupPolicyTypeToString(policy)); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list