From nobody Wed May 14 16:57:40 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 1520951914654621.5214163680596; Tue, 13 Mar 2018 07:38:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 57AA4C0528C2; Tue, 13 Mar 2018 14:38:33 +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 25FFB5C893; Tue, 13 Mar 2018 14:38:33 +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 DB2C04CA9C; Tue, 13 Mar 2018 14:38:32 +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 w2DEcLhP003366 for ; Tue, 13 Mar 2018 10:38:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C5F72166BB2; 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 8C54B2166BDA; Tue, 13 Mar 2018 14:38:20 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 13 Mar 2018 15:37:27 +0100 Message-Id: <3b2cd77696cd41e6db2b303ac688ea6ada995b47.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 01/10] conf: Remove unnecessary condition from 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.16 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:33 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Now that the function is using virXMLFormatElement we don't need to conditionally format anything, since we'll format the element according to the presence of content. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 126 ++++++++++++++++++++++++---------------------= ---- 1 file changed, 62 insertions(+), 64 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04a6ee77af..ddabc77a9b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22832,81 +22832,79 @@ virDomainDiskSourceFormatInternal(virBufferPtr bu= f, if (policy) startupPolicy =3D virDomainStartupPolicyTypeToString(policy); - if (src->path || src->nhosts > 0 || src->srcpool || startupPolicy) { - switch ((virStorageType)src->type) { - case VIR_STORAGE_TYPE_FILE: - virBufferEscapeString(&attrBuf, " file=3D'%s'", src->path); - virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", start= upPolicy); - - virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabel= s, - src->seclabels, flags, - skipSeclabels); - break; - - case VIR_STORAGE_TYPE_BLOCK: - virBufferEscapeString(&attrBuf, " dev=3D'%s'", src->path); - virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", start= upPolicy); - - virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabel= s, - src->seclabels, flags, - skipSeclabels); - break; + switch ((virStorageType)src->type) { + case VIR_STORAGE_TYPE_FILE: + virBufferEscapeString(&attrBuf, " file=3D'%s'", src->path); + virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", startupPo= licy); - case VIR_STORAGE_TYPE_DIR: - virBufferEscapeString(&attrBuf, " dir=3D'%s'", src->path); - virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", start= upPolicy); - break; + virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels, + src->seclabels, flags, + skipSeclabels); + break; - case VIR_STORAGE_TYPE_NETWORK: - if (virDomainDiskSourceFormatNetwork(&attrBuf, &childBuf, - src, flags) < 0) - goto error; - break; + case VIR_STORAGE_TYPE_BLOCK: + virBufferEscapeString(&attrBuf, " dev=3D'%s'", src->path); + virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", startupPo= licy); - case VIR_STORAGE_TYPE_VOLUME: - if (src->srcpool) { - virBufferEscapeString(&attrBuf, " pool=3D'%s'", src->srcpo= ol->pool); - virBufferEscapeString(&attrBuf, " volume=3D'%s'", - src->srcpool->volume); - if (src->srcpool->mode) - virBufferAsprintf(&attrBuf, " mode=3D'%s'", - virStorageSourcePoolModeTypeToString= (src->srcpool->mode)); - } - virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", start= upPolicy); + virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels, + src->seclabels, flags, + skipSeclabels); + break; - virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabel= s, - src->seclabels, flags, - skipSeclabels); - break; + case VIR_STORAGE_TYPE_DIR: + virBufferEscapeString(&attrBuf, " dir=3D'%s'", src->path); + virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", startupPo= licy); + break; - case VIR_STORAGE_TYPE_NONE: - case VIR_STORAGE_TYPE_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected disk type %d"), src->type); + case VIR_STORAGE_TYPE_NETWORK: + if (virDomainDiskSourceFormatNetwork(&attrBuf, &childBuf, + src, flags) < 0) goto error; + break; + + case VIR_STORAGE_TYPE_VOLUME: + if (src->srcpool) { + 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'", + virStorageSourcePoolModeTypeToString(src= ->srcpool->mode)); } + virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", startupPo= licy); - /* 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 - * kept in the storage pool and would be overwritten anyway. - * So avoid formatting it for volumes. */ - if (src->auth && src->authInherited && - src->type !=3D VIR_STORAGE_TYPE_VOLUME) - virStorageAuthDefFormat(&childBuf, src->auth); + virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels, + src->seclabels, flags, + skipSeclabels); + break; - /* 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) - goto error; + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected disk type %d"), src->type); + goto error; + } - if (virDomainDiskSourceFormatPrivateData(&childBuf, src, flags, xm= lopt) < 0) - goto error; + /* 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 + * kept in the storage pool and would be overwritten anyway. + * So avoid formatting it for volumes. */ + if (src->auth && src->authInherited && + src->type !=3D VIR_STORAGE_TYPE_VOLUME) + virStorageAuthDefFormat(&childBuf, src->auth); - if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) - goto error; - } + /* 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) + goto error; + + if (virDomainDiskSourceFormatPrivateData(&childBuf, src, flags, xmlopt= ) < 0) + goto error; + + if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) + goto error; return 0; --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list