From nobody Sun Feb 8 21:48:07 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 1551860474986839.875026555989; Wed, 6 Mar 2019 00:21:14 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2686A307D942; Wed, 6 Mar 2019 08:21:13 +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 E93231001DC5; Wed, 6 Mar 2019 08:21:12 +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 A23523FAF6; Wed, 6 Mar 2019 08:21:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x268L04A032523 for ; Wed, 6 Mar 2019 03:21:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4E2701A91B; Wed, 6 Mar 2019 08:21:00 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6A311A267 for ; Wed, 6 Mar 2019 08:20:59 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 6 Mar 2019 09:20:35 +0100 Message-Id: <616e575513a7e35d0d02fc68ab6b6ed3b3a411ff.1551859940.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/23] conf: Split out formatting of 'blkiotune' from virDomainDefFormatInternal 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 06 Mar 2019 08:21:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Split out the code into a separate function named virDomainDefFormatBlkiotune and use virXMLFormatElement. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 89 ++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5d745f8bce..01ec5c8ca9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -27696,6 +27696,51 @@ virDomainVsockDefFormat(virBufferPtr buf, } +static int +virDomainDefFormatBlkiotune(virBufferPtr buf, + virDomainDefPtr def) +{ + VIR_AUTOCLEAN(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; + ssize_t n; + + virBufferSetChildIndent(&childrenBuf, buf); + if (def->blkio.weight) + virBufferAsprintf(&childrenBuf, "%u\n", + def->blkio.weight); + + for (n =3D 0; n < def->blkio.ndevices; n++) { + virBlkioDevicePtr dev =3D &def->blkio.devices[n]; + + if (!dev->weight && !dev->riops && !dev->wiops && + !dev->rbps && !dev->wbps) + continue; + virBufferAddLit(&childrenBuf, "\n"); + virBufferAdjustIndent(&childrenBuf, 2); + virBufferEscapeString(&childrenBuf, "%s\n", + dev->path); + if (dev->weight) + virBufferAsprintf(&childrenBuf, "%u\n", + dev->weight); + if (dev->riops) + virBufferAsprintf(&childrenBuf, "%u\n", + dev->riops); + if (dev->wiops) + virBufferAsprintf(&childrenBuf, "%u\n", + dev->wiops); + if (dev->rbps) + virBufferAsprintf(&childrenBuf, "%llu\n", + dev->rbps); + if (dev->wbps) + virBufferAsprintf(&childrenBuf, "%llu\n", + dev->wbps); + virBufferAdjustIndent(&childrenBuf, -2); + virBufferAddLit(&childrenBuf, "\n"); + } + + return virXMLFormatElement(buf, "blkiotune", NULL, &childrenBuf); +} + + /* This internal version appends to an existing buffer * (possibly with auto-indent), rather than flattening * to string. @@ -27797,51 +27842,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAsprintf(buf, "%llu\n", def->mem.cur_balloon); - /* start format blkiotune */ - virBufferSetChildIndent(&childrenBuf, buf); - if (def->blkio.weight) - virBufferAsprintf(&childrenBuf, "%u\n", - def->blkio.weight); - - for (n =3D 0; n < def->blkio.ndevices; n++) { - virBlkioDevicePtr dev =3D &def->blkio.devices[n]; - - if (!dev->weight && !dev->riops && !dev->wiops && - !dev->rbps && !dev->wbps) - continue; - virBufferAddLit(&childrenBuf, "\n"); - virBufferAdjustIndent(&childrenBuf, 2); - virBufferEscapeString(&childrenBuf, "%s\n", - dev->path); - if (dev->weight) - virBufferAsprintf(&childrenBuf, "%u\n", - dev->weight); - if (dev->riops) - virBufferAsprintf(&childrenBuf, "%u\n", - dev->riops); - if (dev->wiops) - virBufferAsprintf(&childrenBuf, "%u\n", - dev->wiops); - if (dev->rbps) - virBufferAsprintf(&childrenBuf, "%llu\n", - dev->rbps); - if (dev->wbps) - virBufferAsprintf(&childrenBuf, "%llu\n", - dev->wbps); - virBufferAdjustIndent(&childrenBuf, -2); - virBufferAddLit(&childrenBuf, "\n"); - } - - if (virBufferCheckError(&childrenBuf) < 0) + if (virDomainDefFormatBlkiotune(buf, def) < 0) goto error; - if (virBufferUse(&childrenBuf)) { - virBufferAddLit(buf, "\n"); - virBufferAddBuffer(buf, &childrenBuf); - virBufferAddLit(buf, "\n"); - } - virBufferFreeAndReset(&childrenBuf); - if (virDomainMemtuneFormat(buf, &def->mem) < 0) goto error; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list