From nobody Sun Feb 8 23:37:04 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 ARC-Seal: i=1; a=rsa-sha256; t=1571151808; cv=none; d=zoho.com; s=zohoarc; b=J5Jc24/OJaVJoYYMHjW01n3Mj0YzEmz07jgzAO7/mkhq/EclqWmmJkCLTSOcZkhOJVA0QsYGGynndki+2dmfQoavG/94PmhcdhCqjli2Xkqj1HdQvpartTJ4xFQzYmhWGOFS52blNUc9eDMdW6TThU3kCGfuljm3oGkfjePuJIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571151808; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=13sALp+63L9zid3MmsRQ2oRmP0E/ybyYk4/xg9WUGIM=; b=YOapg1DoSe00zIFjrEEY2QxHkKjEvoHSm8UkgLMLS6iwt2Tn91tH9lsiJGkYWxYX0h0ME+7cqA2v21jS31OnBohI1Bjo75u5veptHo1JSq+nN9R8ozLTumI3xMDkpIHTYxik0fvr5qmBSvnkQamvhQOZsj84T9vcTA6BN8I5Hvw= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571151808742597.866099933047; Tue, 15 Oct 2019 08:03:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B175BC010931; Tue, 15 Oct 2019 15:03:26 +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 85DE0194BB; Tue, 15 Oct 2019 15:03:26 +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 422454EE6A; Tue, 15 Oct 2019 15:03:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FF3K7c022736 for ; Tue, 15 Oct 2019 11:03:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id C2B7560C57; Tue, 15 Oct 2019 15:03:20 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F18CC60BE2 for ; Tue, 15 Oct 2019 15:03:19 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:03:07 +0200 Message-Id: <039ca75b75287f30d3d5fdd8b06c8b37c018c180.1571151764.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/9] virbuffer: use g_auto directly for virBuffer 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-Type: text/plain; charset="utf-8" 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 15 Oct 2019 15:03:27 +0000 (UTC) Since commit 44e7f029159ed701b4a1739ac711507ee53790ed util: rewrite auto cleanup macros to use glib's equivalent VIR_AUTOCLEAN is just an alias for g_auto. Use the GLib macros directly instead of our custom aliases. Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 100 +++++++++++++------------- src/libxl/xen_common.c | 2 +- src/qemu/qemu_command.c | 136 +++++++++++++++++------------------ src/qemu/qemu_domain.c | 28 ++++---- src/qemu/qemu_firmware.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/util/virbuffer.h | 2 +- src/util/virjson.c | 2 +- tests/qemublocktest.c | 8 +-- tests/qemumonitortestutils.c | 2 +- tests/virbuftest.c | 6 +- tests/virstoragetest.c | 2 +- tests/virsystemdtest.c | 2 +- 13 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 10d6bf0eea..16b939d511 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7095,8 +7095,8 @@ virDomainDeviceInfoFormat(virBufferPtr buf, virDomainDeviceInfoPtr info, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 if ((flags & VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT) && info->bootIndex) { @@ -24139,7 +24139,7 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr b= uf, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 if (!(flags & VIR_DOMAIN_DEF_FORMAT_STATUS) || @@ -24183,8 +24183,8 @@ virDomainDiskSourceFormat(virBufferPtr buf, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -24271,8 +24271,8 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf, virDomainXMLOptionPtr xmlopt, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; bool inactive =3D flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE; virStorageSourcePtr backingStore =3D src->backingStore; =20 @@ -24435,8 +24435,8 @@ virDomainDiskDefFormatMirror(virBufferPtr buf, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; const char *formatStr =3D NULL; =20 virBufferSetChildIndent(&childBuf, buf); @@ -24488,7 +24488,7 @@ virDomainDiskDefFormatPrivateData(virBufferPtr buf, unsigned int flags, virDomainXMLOptionPtr xmlopt) { - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; =20 if (!(flags & VIR_DOMAIN_DEF_FORMAT_STATUS) || !xmlopt || @@ -24637,7 +24637,7 @@ static int virDomainControllerDriverFormat(virBufferPtr buf, virDomainControllerDefPtr def) { - VIR_AUTOCLEAN(virBuffer) driverBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverBuf =3D VIR_BUFFER_INITIALIZER; =20 if (def->queues) virBufferAsprintf(&driverBuf, " queues=3D'%u'", def->queues); @@ -24670,8 +24670,8 @@ virDomainControllerDefFormat(virBufferPtr buf, const char *type =3D virDomainControllerTypeToString(def->type); const char *model =3D NULL; const char *modelName =3D NULL; - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -24839,7 +24839,7 @@ virDomainFSDefFormat(virBufferPtr buf, const char *fsdriver =3D virDomainFSDriverTypeToString(def->fsdriver); const char *wrpolicy =3D virDomainFSWrpolicyTypeToString(def->wrpolicy= ); const char *src =3D def->src->path; - VIR_AUTOCLEAN(virBuffer) driverBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 if (!type) { @@ -25442,7 +25442,7 @@ virDomainNetDefFormat(virBufferPtr buf, const char *typeStr; virDomainHostdevDefPtr hostdef =3D NULL; char macstr[VIR_MAC_STRING_BUFLEN]; - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; =20 /* publicActual is true if we should report the current state in * def->data.network.actual *instead of* the config (*not* in @@ -25785,8 +25785,8 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virDomainChrSourceDefPtr def, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -26070,7 +26070,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, unsigned int flags) { const char *mode =3D virDomainSmartcardTypeToString(def->type); - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; size_t i; int ret =3D -1; =20 @@ -26203,7 +26203,7 @@ virDomainSoundDefFormat(virBufferPtr buf, unsigned int flags) { const char *model =3D virDomainSoundModelTypeToString(def->model); - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; size_t i; int ret =3D -1; =20 @@ -26246,9 +26246,9 @@ virDomainMemballoonDefFormat(virBufferPtr buf, unsigned int flags) { const char *model =3D virDomainMemballoonModelTypeToString(def->model); - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; =20 if (!model) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -26302,8 +26302,8 @@ virDomainWatchdogDefFormat(virBufferPtr buf, { const char *model =3D virDomainWatchdogModelTypeToString(def->model); const char *action =3D virDomainWatchdogActionTypeToString(def->action= ); - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -26330,8 +26330,8 @@ virDomainWatchdogDefFormat(virBufferPtr buf, static int virDomainPanicDefFormat(virBufferPtr buf, virDomainPanicDefPtr def) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; =20 if (def->model) virBufferAsprintf(&attrBuf, " model=3D'%s'", @@ -26391,7 +26391,7 @@ virDomainRNGDefFormat(virBufferPtr buf, { const char *model =3D virDomainRNGModelTypeToString(def->model); const char *backend =3D virDomainRNGBackendTypeToString(def->backend); - VIR_AUTOCLEAN(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; =20 virBufferAsprintf(buf, "\n", model); virBufferAdjustIndent(buf, 2); @@ -26585,7 +26585,7 @@ virDomainVideoDefFormat(virBufferPtr buf, unsigned int flags) { const char *model =3D virDomainVideoTypeToString(def->type); - VIR_AUTOCLEAN(virBuffer) driverBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 if (!model) { @@ -26656,9 +26656,9 @@ virDomainInputDefFormat(virBufferPtr buf, { const char *type =3D virDomainInputTypeToString(def->type); const char *bus =3D virDomainInputBusTypeToString(def->bus); - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; =20 /* don't format keyboard into migratable XML for backward compatibilit= y */ if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && @@ -27388,8 +27388,8 @@ virDomainHubDefFormat(virBufferPtr buf, unsigned int flags) { const char *type =3D virDomainHubTypeToString(def->type); - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; =20 virBufferSetChildIndent(&childBuf, buf); =20 @@ -27656,7 +27656,7 @@ virDomainCachetuneDefFormat(virBufferPtr buf, virDomainResctrlDefPtr resctrl, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; size_t i =3D 0; int ret =3D -1; VIR_AUTOFREE(char *) vcpus =3D NULL; @@ -27725,7 +27725,7 @@ virDomainMemorytuneDefFormat(virBufferPtr buf, virDomainResctrlDefPtr resctrl, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; VIR_AUTOFREE(char *) vcpus =3D NULL; =20 @@ -27772,7 +27772,7 @@ virDomainCputuneDefFormat(virBufferPtr buf, unsigned int flags) { size_t i; - VIR_AUTOCLEAN(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 virBufferSetChildIndent(&childrenBuf, buf); @@ -27960,9 +27960,9 @@ static int virDomainIOMMUDefFormat(virBufferPtr buf, const virDomainIOMMUDef *iommu) { - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 virBufferSetChildIndent(&childBuf, buf); @@ -28004,7 +28004,7 @@ static int virDomainMemtuneFormat(virBufferPtr buf, const virDomainMemtune *mem) { - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 virBufferSetChildIndent(&childBuf, buf); @@ -28066,9 +28066,9 @@ static int virDomainVsockDefFormat(virBufferPtr buf, virDomainVsockDefPtr vsock) { - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) cidAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cidAttrBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 if (vsock->model) { @@ -28104,7 +28104,7 @@ static int virDomainDefFormatBlkiotune(virBufferPtr buf, virDomainDefPtr def) { - VIR_AUTOCLEAN(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childrenBuf =3D VIR_BUFFER_INITIALIZER; ssize_t n; =20 virBufferSetChildIndent(&childrenBuf, buf); @@ -28149,9 +28149,9 @@ static int virDomainDefFormatFeatures(virBufferPtr buf, virDomainDefPtr def) { - VIR_AUTOCLEAN(virBuffer) tmpAttrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) tmpChildBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) tmpAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) tmpChildBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 virBufferSetChildIndent(&childBuf, buf); @@ -28998,7 +28998,7 @@ virDomainObjFormat(virDomainXMLOptionPtr xmlopt, virCapsPtr caps, unsigned int flags) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int state; int reason; size_t i; @@ -29979,7 +29979,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, virDomainXMLOptionPtr xmlopt, void *parseOpaque) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int flags =3D VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_S= ECURE; int rc =3D -1; char *netprefix; @@ -30454,7 +30454,7 @@ virDomainGetBlkioParametersAssignFromDef(virDomainD= efPtr def, int *nparams, int maxparams) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *data =3D NULL; size_t i; =20 diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 2680e88a60..9632604807 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2373,7 +2373,7 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def) static int xenFormatSound(virConfPtr conf, virDomainDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char * model; VIR_AUTOFREE(char *) str =3D NULL; size_t i; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c2a19689c5..f4563eac37 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -209,7 +209,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, { VIR_AUTOFREE(char *) alias =3D NULL; VIR_AUTOFREE(char *) path =3D NULL; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 /* If the -object secret does not exist, then just return. This just * means the domain won't be able to use a secret master key and is @@ -730,7 +730,7 @@ static int qemuBuildObjectSecretCommandLine(virCommandPtr cmd, qemuDomainSecretInfoPtr secinfo) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (qemuBuildSecretInfoProps(secinfo, &props) < 0) @@ -921,7 +921,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd, const char *alias, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (qemuBuildTLSx509BackendProps(tlspath, isListen, verifypeer, alias, @@ -962,7 +962,7 @@ static char * qemuBuildNetworkDriveStr(virStorageSourcePtr src, qemuDomainSecretInfoPtr secinfo) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; char *ret =3D NULL; =20 @@ -1786,7 +1786,7 @@ static char * qemuBuildDriveStr(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; int detect_zeroes =3D virDomainDiskGetDetectZeroesMode(disk->discard, disk->detect_zero= es); =20 @@ -1951,7 +1951,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, unsigned int bootindex, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; const char *bus =3D virDomainDiskQEMUBusTypeToString(disk->bus); const char *contAlias; VIR_AUTOFREE(char *) backendAlias =3D NULL; @@ -2293,7 +2293,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, char * qemuBuildZPCIDevStr(virDomainDeviceInfoPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 virBufferAsprintf(&buf, "zpci,uid=3D%u,fid=3D%u,target=3D%s,id=3Dzpci%u", @@ -2345,7 +2345,7 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, virQEMUCapsPtr qemuCaps, unsigned int bootFloppy) { - VIR_AUTOCLEAN(virBuffer) fdc_opts =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) fdc_opts =3D VIR_BUFFER_INITIALIZER; bool explicitfdc =3D qemuDomainNeedsFDC(def); bool hasfloppy =3D false; unsigned int bootindex; @@ -2422,7 +2422,7 @@ static int qemuBuildObjectCommandline(virCommandPtr cmd, virJSONValuePtr objProps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!objProps) return 0; @@ -2617,7 +2617,7 @@ qemuBuildDisksCommandLine(virCommandPtr cmd, static char * qemuBuildFSStr(virDomainFSDefPtr fs) { - VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; const char *wrpolicy =3D virDomainFSWrpolicyTypeToString(fs->wrpolicy); =20 if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_PATH || @@ -2657,7 +2657,7 @@ qemuBuildFSDevStr(const virDomainDef *def, virDomainFSDefPtr fs, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; =20 if (qemuBuildVirtioDevStr(&opt, "virtio-9p", qemuCaps, VIR_DOMAIN_DEVICE_FS, fs) < 0) @@ -2864,7 +2864,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, virQEMUCapsPtr qemuCaps, char **devstr) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 *devstr =3D NULL; =20 @@ -3643,7 +3643,7 @@ char * qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem, qemuDomainObjPrivatePtr priv) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *device; =20 if (!mem->info.alias) { @@ -3729,7 +3729,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, size_t vhostfdSize, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; bool usingVirtio =3D false; char macaddr[VIR_MAC_STRING_BUFLEN]; =20 @@ -3903,7 +3903,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, const char *slirpfd) { bool is_tap =3D false; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainNetType netType =3D virDomainNetGetActualType(net); size_t i; =20 @@ -4046,7 +4046,7 @@ qemuBuildWatchdogDevStr(const virDomainDef *def, virDomainWatchdogDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 const char *model =3D virDomainWatchdogModelTypeToString(dev->model); if (!model) { @@ -4114,7 +4114,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!virDomainDefHasMemballoon(def)) return 0; @@ -4149,7 +4149,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, static char * qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (dev->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && dev->info.addr.spaprvio.has_reg) { @@ -4205,7 +4205,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 switch ((virDomainInputType)dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: @@ -4262,7 +4262,7 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 switch (dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: @@ -4345,7 +4345,7 @@ qemuBuildSoundDevStr(const virDomainDef *def, virDomainSoundDefPtr sound, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *model =3D NULL; =20 /* Hack for devices with different names in QEMU and libvirt */ @@ -4420,7 +4420,7 @@ qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, virDomainSoundCodecDefPtr codec, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *stype; int type, flags; =20 @@ -4508,7 +4508,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, virDomainVideoDefPtr video, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *model =3D NULL; =20 /* We try to chose the best model for primary video device by preferri= ng @@ -4784,7 +4784,7 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, unsigned int bootIndex, /* used iff dev->info->b= ootIndex =3D=3D 0 */ virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysPCIPtr pcisrc =3D &dev->source.subsys.u.pci; int backend =3D pcisrc->backend; =20 @@ -4833,7 +4833,7 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysUSBPtr usbsrc =3D &dev->source.subsys.u.usb; =20 if (!dev->missing && !usbsrc->bus && !usbsrc->device) { @@ -4866,7 +4866,7 @@ qemuBuildHubDevStr(const virDomainDef *def, virDomainHubDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (dev->type !=3D VIR_DOMAIN_HUB_TYPE_USB) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -4931,7 +4931,7 @@ static char * qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) netsource =3D NULL; VIR_AUTOPTR(virJSONValue) srcprops =3D NULL; virDomainHostdevSubsysSCSIPtr scsisrc =3D &dev->source.subsys.u.scsi; @@ -4967,7 +4967,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *d= ef, virQEMUCapsPtr qemuCaps, char *vhostfdName) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysSCSIVHostPtr hostsrc =3D &dev->source.subsys.u.s= csi_host; =20 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_SCSI)) { @@ -4999,7 +4999,7 @@ char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) source =3D NULL; VIR_AUTOFREE(char *) drivealias =3D NULL; virDomainHostdevSubsysSCSIPtr scsisrc =3D &dev->source.subsys.u.scsi; @@ -5031,7 +5031,7 @@ char * qemuBuildSCSIHostdevDevStr(const virDomainDef *def, virDomainHostdevDefPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int model =3D -1; VIR_AUTOFREE(char *) driveAlias =3D NULL; const char *contAlias; @@ -5228,7 +5228,7 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, unsigned int flags) { qemuDomainChrSourcePrivatePtr chrSourcePriv =3D QEMU_DOMAIN_CHR_SOURCE= _PRIVATE(dev); - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; bool telnet; VIR_AUTOFREE(char *) charAlias =3D NULL; =20 @@ -5422,7 +5422,7 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *de= f, virDomainHostdevDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysMediatedDevPtr mdevsrc =3D &dev->source.subsys.u= .mdev; VIR_AUTOFREE(char *) mdevPath =3D NULL; const char *dev_str =3D NULL; @@ -5656,7 +5656,7 @@ static char * qemuBuildVirtioSerialPortDevStr(const virDomainDef *def, virDomainChrDefPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *contAlias; =20 switch (dev->deviceType) { @@ -5719,7 +5719,7 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *d= ef, static char * qemuBuildSclpDevStr(virDomainChrDefPtr dev) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; if (dev->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE) { switch (dev->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: @@ -5841,7 +5841,7 @@ qemuBuildRNGDevStr(const virDomainDef *def, virDomainRNGDefPtr dev, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!qemuDomainCheckCCWS390AddressSupport(def, &dev->info, qemuCaps, dev->source.file)) @@ -5936,7 +5936,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, static char * qemuBuildSmbiosBiosStr(virSysinfoBIOSDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!def) return NULL; @@ -5972,7 +5972,7 @@ static char * qemuBuildSmbiosSystemStr(virSysinfoSystemDefPtr def, bool skip_uuid) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!def || (!def->manufacturer && !def->product && !def->version && @@ -6025,7 +6025,7 @@ qemuBuildSmbiosSystemStr(virSysinfoSystemDefPtr def, static char * qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!def) return NULL; @@ -6071,7 +6071,7 @@ qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPtr= def) static char * qemuBuildSmbiosOEMStringsStr(virSysinfoOEMStringsDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 if (!def) @@ -6091,7 +6091,7 @@ qemuBuildSmbiosOEMStringsStr(virSysinfoOEMStringsDefP= tr def) static char * qemuBuildSmbiosChassisStr(virSysinfoChassisDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!def) return NULL; @@ -6216,7 +6216,7 @@ qemuBuildVMGenIDCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) opts =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opts =3D VIR_BUFFER_INITIALIZER; char guid[VIR_UUID_STRING_BUFLEN]; =20 if (!def->genidRequested) @@ -6266,7 +6266,7 @@ static char * qemuBuildClockArgStr(virDomainClockDefPtr def) { size_t i; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 switch (def->offset) { case VIR_DOMAIN_CLOCK_OFFSET_UTC: @@ -6547,7 +6547,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) boot_buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) boot_buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) boot_opts_str =3D NULL; =20 if (def->os.bootmenu) { @@ -6627,7 +6627,7 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd, =20 switch (iommu->model) { case VIR_DOMAIN_IOMMU_MODEL_INTEL: { - VIR_AUTOCLEAN(virBuffer) opts =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opts =3D VIR_BUFFER_INITIALIZER; =20 /* qemuDomainDeviceDefValidateIOMMU() already made sure we have * one of QEMU_CAPS_DEVICE_INTEL_IOMMU or QEMU_CAPS_MACHINE_IOMMU: @@ -6841,8 +6841,8 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virArch hostarch =3D virArchFromHost(); VIR_AUTOFREE(char *) cpu =3D NULL; VIR_AUTOFREE(char *) cpu_flags =3D NULL; - VIR_AUTOCLEAN(virBuffer) cpu_buf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cpu_buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 if (def->cpu && @@ -7119,7 +7119,7 @@ qemuBuildNameCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 virCommandAddArg(cmd, "-name"); =20 @@ -7149,7 +7149,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virTristateSwitch vmport =3D def->features[VIR_DOMAIN_FEATURE_VMPORT]; virTristateSwitch smm =3D def->features[VIR_DOMAIN_FEATURE_SMM]; virCPUDefPtr cpu =3D def->cpu; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t i; =20 /* This should *never* be NULL, since we always provide @@ -7469,7 +7469,7 @@ static int qemuBuildSmpCommandLine(virCommandPtr cmd, virDomainDefPtr def) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; unsigned int maxvcpus =3D virDomainDefGetVcpusMax(def); unsigned int nvcpus =3D 0; virDomainVcpuDefPtr vcpu; @@ -7630,7 +7630,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, { size_t i, j; virQEMUCapsPtr qemuCaps =3D priv->qemuCaps; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *cpumask =3D NULL; char *tmpmask =3D NULL; char *next =3D NULL; @@ -7793,7 +7793,7 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd, /* memory hotplug requires NUMA to be enabled - we already checked * that memory devices are present only when NUMA is */ for (i =3D 0; i < def->nmems; i++) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *dimmStr; =20 if (qemuBuildMemoryDimmBackendStr(&buf, def->mems[i], def, cfg, pr= iv) < 0) @@ -7820,7 +7820,7 @@ qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPt= r cfg G_GNUC_UNUSED, virQEMUCapsPtr qemuCaps G_GNUC_UNUSED, virDomainGraphicsDefPtr graphics) { - VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; =20 if (graphics->data.sdl.xauth) virCommandAddEnvPair(cmd, "XAUTHORITY", graphics->data.sdl.xauth); @@ -7867,7 +7867,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPt= r cfg, virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { - VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; virDomainGraphicsListenDefPtr glisten =3D NULL; bool escapeAddr; =20 @@ -8000,7 +8000,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { - VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; virDomainGraphicsListenDefPtr glisten =3D NULL; int port =3D graphics->data.spice.port; int tlsPort =3D graphics->data.spice.tlsPort; @@ -8248,7 +8248,7 @@ qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriver= ConfigPtr cfg G_GNUC_UNUSED virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { - VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; =20 virBufferAddLit(&opt, "egl-headless"); =20 @@ -8777,7 +8777,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logMan= ager, size_t i; virDomainSmartcardDefPtr smartcard; VIR_AUTOFREE(char *) devstr =3D NULL; - VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; const char *database; const char *contAlias =3D NULL; unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT | @@ -8886,7 +8886,7 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def, virDomainShmemDefPtr shmem, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -8929,7 +8929,7 @@ qemuBuildShmemDevStr(virDomainDefPtr def, virDomainShmemDefPtr shmem, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if ((shmem->model =3D=3D VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN)) || @@ -9001,7 +9001,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, bool chardevStdioLogd) { VIR_AUTOPTR(virJSONValue) memProps =3D NULL; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) devstr =3D NULL; VIR_AUTOFREE(char *) chardev =3D NULL; int rc; @@ -9426,7 +9426,7 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { size_t i; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainRedirFilterDefPtr redirfilter =3D def->redirfilter; =20 if (dev->bus !=3D VIR_DOMAIN_REDIRDEV_BUS_USB) { @@ -9544,7 +9544,7 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, virDomainDefPtr def) { virDomainLoaderDefPtr loader =3D def->os.loader; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; int unit =3D 0; =20 if (!loader) @@ -9601,7 +9601,7 @@ static char * qemuBuildTPMDevStr(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const virDomainTPMDef *tpm =3D def->tpm; const char *model =3D virDomainTPMModelTypeToString(tpm->model); virQEMUCapsFlags flag; @@ -9670,7 +9670,7 @@ qemuBuildTPMBackendStr(const virDomainDef *def, char **chardev) { const virDomainTPMDef *tpm =3D def->tpm; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) cancel_path =3D NULL; VIR_AUTOFREE(char *) devset =3D NULL; VIR_AUTOFREE(char *) cancelset =3D NULL; @@ -9780,7 +9780,7 @@ static int qemuBuildSEVCommandLine(virDomainObjPtr vm, virCommandPtr cmd, virDomainSEVDefPtr sev) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; qemuDomainObjPrivatePtr priv =3D vm->privateData; char *path =3D NULL; =20 @@ -9990,7 +9990,7 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd, const virDomainDef *def, qemuDomainObjPrivatePtr priv) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (!virDomainDefHasManagedPR(def)) @@ -10049,7 +10049,7 @@ qemuBuildDBusVMStateCommandLineEach(void *payload, { qemuBuildDBusVMStateCommandLineData *data =3D user_data; qemuDBusVMStatePtr vms =3D payload; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) props =3D NULL; =20 if (!(props =3D qemuBuildDBusVMStateInfoProps(id, vms->addr))) @@ -10213,7 +10213,7 @@ qemuBuildVsockDevStr(virDomainDefPtr def, const char *fdprefix) { qemuDomainVsockPrivatePtr priv =3D (qemuDomainVsockPrivatePtr)vsock->p= rivateData; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (qemuBuildVirtioDevStr(&buf, "vhost-vsock", qemuCaps, VIR_DOMAIN_DEVICE_VSOCK, vsock) < 0) { @@ -10548,7 +10548,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virDomainChrDefPtr serial, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virQEMUCapsFlags caps; =20 switch ((virDomainChrSerialTargetModel) serial->targetModel) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c638077aa8..734ea7a764 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2301,7 +2301,7 @@ static int qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, virBufferPtr buf) { - VIR_AUTOCLEAN(virBuffer) tmp =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) tmp =3D VIR_BUFFER_INITIALIZER; qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(src); int ret =3D -1; =20 @@ -2447,8 +2447,8 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(vir= BufferPtr buf, virDomainXMLOptionPtr xm= lopt, bool chain) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; unsigned int xmlflags =3D VIR_DOMAIN_DEF_FORMAT_STATUS; =20 virBufferSetChildIndent(&childBuf, buf); @@ -2476,9 +2476,9 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *p= ayload, const void *name G_GNUC_UNUS= ED, void *opaque) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) chainsBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) chainsBuf =3D VIR_BUFFER_INITIALIZER; qemuBlockJobDataPtr job =3D payload; const char *state =3D qemuBlockjobStateTypeToString(job->state); const char *newstate =3D NULL; @@ -2571,8 +2571,8 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBufferPtr b= uf, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; bool bj =3D qemuDomainHasBlockjob(vm, false); struct qemuDomainPrivateBlockJobFormatData iterdata =3D { priv->driver= ->xmlopt, &childBuf }; @@ -2616,8 +2616,8 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBu= fferPtr buf, virStorageSourcePtr src, virDomainXMLOptionPtr xmlo= pt) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 virBufferSetChildIndent(&childBuf, buf); @@ -2645,8 +2645,8 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPt= r buf, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; size_t i; virDomainDiskDefPtr disk; qemuDomainDiskPrivatePtr diskPriv; @@ -2683,8 +2683,8 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, virDomainObjPtr vm, qemuDomainObjPrivatePtr priv) { - VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; qemuDomainJob job =3D priv->job.active; int ret =3D -1; =20 diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index aba2c359e7..6d3faadd23 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -290,7 +290,7 @@ qemuFirmwareInterfaceParse(const char *path, { virJSONValuePtr interfacesJSON; VIR_AUTOPTR(qemuFirmwareOSInterface) interfaces =3D NULL; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; size_t ninterfaces; size_t i; =20 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d3447dd2f3..242b637451 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -302,7 +302,7 @@ qemuMonitorJSONCommandWithFd(qemuMonitorPtr mon, { int ret =3D -1; qemuMonitorMessage msg; - VIR_AUTOCLEAN(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) cmdbuf =3D VIR_BUFFER_INITIALIZER; char *id =3D NULL; =20 *reply =3D NULL; diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index 1c9748643e..0c074121bc 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -55,7 +55,7 @@ int virBufferCheckErrorInternal(const virBuffer *buf, size_t linenr) ATTRIBUTE_NONNULL(1); =20 -VIR_DEFINE_AUTOCLEAN_FUNC(virBuffer, virBufferFreeAndReset); +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virBuffer, virBufferFreeAndReset); =20 /** * virBufferCheckError diff --git a/src/util/virjson.c b/src/util/virjson.c index 07b3e8823c..5e3c00a19c 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -2025,7 +2025,7 @@ char * virJSONValueToString(virJSONValuePtr object, bool pretty) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (virJSONValueToBuffer(object, &buf, pretty) < 0) return NULL; diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index bb0579056e..2056eeb2e9 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -48,7 +48,7 @@ testBackingXMLjsonXML(const void *args) const struct testBackingXMLjsonXMLdata *data =3D args; VIR_AUTOPTR(xmlDoc) xml =3D NULL; VIR_AUTOPTR(xmlXPathContext) ctxt =3D NULL; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOPTR(virJSONValue) backendprops =3D NULL; VIR_AUTOPTR(virJSONValue) wrapper =3D NULL; VIR_AUTOFREE(char *) propsstr =3D NULL; @@ -401,8 +401,8 @@ testQemuImageCreate(const void *opaque) VIR_AUTOPTR(virJSONValue) protocolprops =3D NULL; VIR_AUTOPTR(virJSONValue) formatprops =3D NULL; VIR_AUTOUNREF(virStorageSourcePtr) src =3D NULL; - VIR_AUTOCLEAN(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) actualbuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) actualbuf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) jsonprotocol =3D NULL; VIR_AUTOFREE(char *) jsonformat =3D NULL; VIR_AUTOFREE(char *) actual =3D NULL; @@ -482,7 +482,7 @@ static int testQemuDiskXMLToPropsValidateFileSrcOnly(const void *opaque) { struct testQemuDiskXMLToJSONData *data =3D (void *) opaque; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) jsonpath =3D NULL; VIR_AUTOFREE(char *) actual =3D NULL; size_t i; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 4dd7328028..52e4619f38 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -511,7 +511,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonito= rTestPtr test, const char *cmdname, virJSONValuePtr args) { - VIR_AUTOCLEAN(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; virJSONValuePtr schemaroot; VIR_AUTOPTR(virJSONValue) emptyargs =3D NULL; VIR_AUTOFREE(char *) schemapath =3D NULL; diff --git a/tests/virbuftest.c b/tests/virbuftest.c index f547afe7f7..385f016174 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -306,8 +306,8 @@ static int testBufAddBuffer(const void *data G_GNUC_UNU= SED) static int testBufAddBuffer2(const void *opaque G_GNUC_UNUSED) { - VIR_AUTOCLEAN(virBuffer) buf1 =3D VIR_BUFFER_INITIALIZER; - VIR_AUTOCLEAN(virBuffer) buf2 =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf1 =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf2 =3D VIR_BUFFER_INITIALIZER; =20 /* Intent of this test is to demonstrate a memleak that happen with * virBufferAddBuffer */ @@ -461,7 +461,7 @@ testBufSetIndent(const void *opaque G_GNUC_UNUSED) static int testBufferAutoclean(const void *opaque G_GNUC_UNUSED) { - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 virBufferAddLit(&buf, "test test test\n"); return 0; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 20e407448f..af435189f1 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -610,7 +610,7 @@ static int testBackingParse(const void *args) { const struct testBackingParseData *data =3D args; - VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; VIR_AUTOFREE(char *) xml =3D NULL; VIR_AUTOUNREF(virStorageSourcePtr) src =3D NULL; int rc; diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 8aaac097e9..109e0a5456 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -554,7 +554,7 @@ testActivation(bool useNames) int *fds =3D NULL; size_t nfds =3D 0; VIR_AUTOPTR(virSystemdActivation) act =3D NULL; - VIR_AUTOCLEAN(virBuffer) names =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) names =3D VIR_BUFFER_INITIALIZER; =20 virBufferAddLit(&names, "demo-unix.socket"); =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list