From nobody Fri May 16 00:58:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1503301691306663.6913338634031; Mon, 21 Aug 2017 00:48:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6AFA87E427; Mon, 21 Aug 2017 07:48:09 +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 EC664779F4; Mon, 21 Aug 2017 07:48:08 +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 7B91D1803B21; Mon, 21 Aug 2017 07:48:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7L7m4fm020873 for ; Mon, 21 Aug 2017 03:48:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E4A577BE6; Mon, 21 Aug 2017 07:48:04 +0000 (UTC) Received: from caroline.localdomain (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2CC9D77BE5 for ; Mon, 21 Aug 2017 07:48:02 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline.brq.redhat.com [127.0.0.1]) by caroline.localdomain (Postfix) with ESMTP id E19D4120503 for ; Mon, 21 Aug 2017 09:48:00 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6AFA87E427 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Martin Kletzander To: libvir-list@redhat.com Date: Mon, 21 Aug 2017 09:47:41 +0200 Message-Id: <87131e5f235c2c7cb19255a24c8ab92425d4bc7d.1503301615.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] conf: Clean up and report error in virDomainCapsFormat 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 21 Aug 2017 07:48:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- src/conf/domain_capabilities.c | 68 +++++++++++++++++---------------------= ---- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 7a81c10fd10f..35f8128e70dd 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -516,62 +516,50 @@ virDomainCapsFeatureGICFormat(virBufferPtr buf, } =20 =20 -static int -virDomainCapsFormatInternal(virBufferPtr buf, - virDomainCapsPtr const caps) +char * +virDomainCapsFormat(virDomainCapsPtr const caps) { + virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *virttype_str =3D virDomainVirtTypeToString(caps->virttype); const char *arch_str =3D virArchToString(caps->arch); =20 - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); + virBufferAddLit(&buf, "\n"); + virBufferAdjustIndent(&buf, 2); =20 - virBufferEscapeString(buf, "%s\n", caps->path); - virBufferAsprintf(buf, "%s\n", virttype_str); + virBufferEscapeString(&buf, "%s\n", caps->path); + virBufferAsprintf(&buf, "%s\n", virttype_str); if (caps->machine) - virBufferAsprintf(buf, "%s\n", caps->machine); - virBufferAsprintf(buf, "%s\n", arch_str); + virBufferAsprintf(&buf, "%s\n", caps->machine); + virBufferAsprintf(&buf, "%s\n", arch_str); =20 if (caps->maxvcpus) - virBufferAsprintf(buf, "\n", caps->maxvcpus); + virBufferAsprintf(&buf, "\n", caps->maxvcpus); =20 - virDomainCapsOSFormat(buf, &caps->os); - virDomainCapsCPUFormat(buf, &caps->cpu); + virDomainCapsOSFormat(&buf, &caps->os); + virDomainCapsCPUFormat(&buf, &caps->cpu); =20 - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); + virBufferAddLit(&buf, "\n"); + virBufferAdjustIndent(&buf, 2); =20 - virDomainCapsDeviceDiskFormat(buf, &caps->disk); - virDomainCapsDeviceGraphicsFormat(buf, &caps->graphics); - virDomainCapsDeviceVideoFormat(buf, &caps->video); - virDomainCapsDeviceHostdevFormat(buf, &caps->hostdev); + virDomainCapsDeviceDiskFormat(&buf, &caps->disk); + virDomainCapsDeviceGraphicsFormat(&buf, &caps->graphics); + virDomainCapsDeviceVideoFormat(&buf, &caps->video); + virDomainCapsDeviceHostdevFormat(&buf, &caps->hostdev); =20 - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(&buf, -2); + virBufferAddLit(&buf, "\n"); =20 - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); + virBufferAddLit(&buf, "\n"); + virBufferAdjustIndent(&buf, 2); =20 - virDomainCapsFeatureGICFormat(buf, &caps->gic); + virDomainCapsFeatureGICFormat(&buf, &caps->gic); =20 - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(&buf, -2); + virBufferAddLit(&buf, "\n"); =20 - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - return 0; -} - - -char * -virDomainCapsFormat(virDomainCapsPtr const caps) -{ - virBuffer buf =3D VIR_BUFFER_INITIALIZER; - - if (virDomainCapsFormatInternal(&buf, caps) < 0) { - virBufferFreeAndReset(&buf); - return NULL; - } + virBufferAdjustIndent(&buf, -2); + virBufferAddLit(&buf, "\n"); =20 + virBufferCheckError(&buf); return virBufferContentAndReset(&buf); } --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list