From nobody Wed May 14 17:02:47 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 1520952118628209.29326498580292; Tue, 13 Mar 2018 07:41:58 -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 17E71804E2; Tue, 13 Mar 2018 14:41:57 +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 C4B4C5E1D8; Tue, 13 Mar 2018 14:41:56 +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 4F9654CA9A; Tue, 13 Mar 2018 14:41:56 +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 w2DEcO0e003403 for ; Tue, 13 Mar 2018 10:38:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E0E92166BB2; Tue, 13 Mar 2018 14:38:24 +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:23 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 13 Mar 2018 15:37:31 +0100 Message-Id: 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 05/10] conf: disk: Separate virStorageSource formatting 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.27]); Tue, 13 Mar 2018 14:41:57 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move out formatting of 'startuPolicy' which is a property of the disk out of the element. Extracting the code formating the content and attributes will also allow reuse in other parts of the code. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 90 ++++++++++++++++++++++++++++----------------= ---- src/conf/domain_conf.h | 7 ++++ src/libvirt_private.syms | 1 + 3 files changed, 60 insertions(+), 38 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b77cc8ed9f..1c79d2b49b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22798,45 +22798,39 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr= buf, } -static int -virDomainDiskSourceFormatInternal(virBufferPtr buf, - virStorageSourcePtr src, - int policy, - unsigned int flags, - bool skipSeclabels, - virDomainXMLOptionPtr xmlopt) +int +virDomainStorageSourceFormat(virBufferPtr attrBuf, + virBufferPtr childBuf, + virStorageSourcePtr src, + unsigned int flags, + bool skipSeclabels) { - virBuffer attrBuf =3D VIR_BUFFER_INITIALIZER; - 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) - goto error; + return -1; break; case VIR_STORAGE_TYPE_VOLUME: if (src->srcpool) { - virBufferEscapeString(&attrBuf, " pool=3D'%s'", src->srcpool->= pool); - virBufferEscapeString(&attrBuf, " volume=3D'%s'", + virBufferEscapeString(attrBuf, " pool=3D'%s'", src->srcpool->p= ool); + 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)); } @@ -22846,18 +22840,12 @@ virDomainDiskSourceFormatInternal(virBufferPtr bu= f, case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected disk type %d"), src->type); - goto error; + return -1; } - if (src->type !=3D VIR_STORAGE_TYPE_NETWORK) { - if (policy) - virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", - virDomainStartupPolicyTypeToString(polic= y)); - - if (!skipSeclabels) - virDomainSourceDefFormatSeclabel(&childBuf, src->nseclabels, - src->seclabels, flags); - } + if (!skipSeclabels && src->type !=3D VIR_STORAGE_TYPE_NETWORK) + virDomainSourceDefFormatSeclabel(childBuf, src->nseclabels, + src->seclabels, flags); /* Storage Source formatting will not carry through the blunder * that disk source formatting had at one time to format the @@ -22866,26 +22854,52 @@ virDomainDiskSourceFormatInternal(virBufferPtr bu= f, * 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) - goto error; + virStorageEncryptionFormat(childBuf, src->encryption) < 0) + return -1; + + return 0; +} + + +static int +virDomainDiskSourceFormatInternal(virBufferPtr buf, + virStorageSourcePtr src, + int policy, + unsigned int flags, + bool skipSeclabels, + virDomainXMLOptionPtr xmlopt) +{ + virBuffer attrBuf =3D VIR_BUFFER_INITIALIZER; + virBuffer childBuf =3D VIR_BUFFER_INITIALIZER; + int ret =3D -1; + + virBufferSetChildIndent(&childBuf, buf); + + if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags, + skipSeclabels) < 0) + goto cleanup; + + if (policy && src->type !=3D VIR_STORAGE_TYPE_NETWORK) + virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'", + virDomainStartupPolicyTypeToString(policy)); if (virDomainDiskSourceFormatPrivateData(&childBuf, src, flags, xmlopt= ) < 0) - goto error; + goto cleanup; if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) - goto error; + goto cleanup; - return 0; + ret =3D 0; - error: + cleanup: virBufferFreeAndReset(&attrBuf); virBufferFreeAndReset(&childBuf); - return -1; + return ret; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 337ce79425..61379e50fe 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3427,6 +3427,13 @@ int virDomainDiskDefCheckDuplicateInfo(const virDoma= inDiskDef *a, const virDomainDiskDef *b) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +int virDomainStorageSourceFormat(virBufferPtr attrBuf, + virBufferPtr childBuf, + virStorageSourcePtr src, + unsigned int flags, + bool skipSeclabels) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + int virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def, int maplen, int ncpumaps, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3766e20d3b..c67bce7389 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -542,6 +542,7 @@ virDomainStateReasonFromString; virDomainStateReasonToString; virDomainStateTypeFromString; virDomainStateTypeToString; +virDomainStorageSourceFormat; virDomainTaintTypeFromString; virDomainTaintTypeToString; virDomainTimerModeTypeFromString; --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list