From nobody Sun Feb 8 14:57:46 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=1571151830; cv=none; d=zoho.com; s=zohoarc; b=AhH9J3f965qWUQ2IRNwV14T8goo2VTft1EUFBF7Tzu9H3iZ/ZjftZyKu99/yU5bA8/Jvboqksm7nDleXbgmgTjyQxFDTB8P10wCubjCIS1isIjAacQ3hQ73oO7qvZWdYnmS+5mB8ve41YfGyf77q2iWb9r3sh5b9tRUtWu4ELNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571151830; 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=VI9rW2k52zLVFXxapq3coc0J2MNXn8eymBp3pM2miPo=; b=eMppDTila0JGuIVliC4TGhcewImTEjPCo6NhceQU1v19RuP3FswbN+242+kuQ4rJwuMozVFS3ZPmOpOWfdK4HHItvytntMYAJ/qH7a01JMuGbpF84Sn02UiV5/w+l94ood+OALu/Dsq+Ktnotyx6xRh/kUfDYkB7MbGwyFZ3oho= 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 1571151830598490.7158893368047; Tue, 15 Oct 2019 08:03:50 -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 A021F757D7; Tue, 15 Oct 2019 15:03:48 +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 76A1C6061E; Tue, 15 Oct 2019 15:03:48 +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 2FD184EE6D; Tue, 15 Oct 2019 15:03:48 +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 x9FF3R5D022786 for ; Tue, 15 Oct 2019 11:03:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id C8A0660C57; Tue, 15 Oct 2019 15:03:27 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5033260BE2 for ; Tue, 15 Oct 2019 15:03:27 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:03:12 +0200 Message-Id: <3b2fdf302ede7ef525553cf3e7a1a03bc1efc23d.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 7/9] Use g_autoptr instead of VIR_AUTOUNREF 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.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.26]); Tue, 15 Oct 2019 15:03:49 +0000 (UTC) Now that all the types using VIR_AUTOUNREF have a cleanup func defined to virObjectUnref, use g_autoptr instead of VIR_AUTOUNREF. Signed-off-by: J=C3=A1n Tomko --- src/conf/checkpoint_conf.c | 2 +- src/conf/domain_conf.c | 24 ++++++++++++------------ src/esx/esx_driver.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/qemu/qemu_blockjob.c | 14 +++++++------- src/qemu/qemu_checkpoint.c | 10 +++++----- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_conf.c | 10 +++++----- src/qemu/qemu_domain.c | 14 +++++++------- src/qemu/qemu_driver.c | 24 ++++++++++++------------ src/qemu/qemu_firmware.c | 2 +- src/qemu/qemu_hotplug.c | 24 ++++++++++++------------ src/qemu/qemu_migration.c | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_slirp.c | 4 ++-- src/qemu/qemu_vhost_user_gpu.c | 6 +++--- src/storage/storage_backend_gluster.c | 2 +- src/storage/storage_util.c | 4 ++-- src/test/test_driver.c | 4 ++-- src/util/virhostdev.c | 18 +++++++++--------- src/util/virstoragefile.c | 20 ++++++++++---------- src/vbox/vbox_common.c | 4 ++-- src/vz/vz_driver.c | 2 +- tests/qemublocktest.c | 6 +++--- tests/qemudomaincheckpointxml2xmltest.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemusecuritytest.c | 4 ++-- tests/storagepoolcapstest.c | 6 +++--- tests/virstoragetest.c | 8 ++++---- 29 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 376a627ee4..e7b204a4d2 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -134,7 +134,7 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, int n; char *tmp; g_autofree xmlNodePtr *nodes =3D NULL; - VIR_AUTOUNREF(virDomainCheckpointDefPtr) def =3D NULL; + g_autoptr(virDomainCheckpointDef) def =3D NULL; =20 if (!(def =3D virDomainCheckpointDefNew())) return NULL; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a0690e23f7..8616f820fc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1785,7 +1785,7 @@ static virDomainVcpuDefPtr virDomainVcpuDefNew(virDomainXMLOptionPtr xmlopt) { virDomainVcpuDefPtr ret =3D NULL; - VIR_AUTOUNREF(virObjectPtr) priv =3D NULL; + g_autoptr(virObject) priv =3D NULL; =20 if (xmlopt && xmlopt->privateData.vcpuNew && !(priv =3D xmlopt->privateData.vcpuNew())) @@ -9276,7 +9276,7 @@ virDomainStorageSourceParseBase(const char *type, const char *format, const char *index) { - VIR_AUTOUNREF(virStorageSourcePtr) src =3D NULL; + g_autoptr(virStorageSource) src =3D NULL; virStorageSourcePtr ret =3D NULL; =20 if (!(src =3D virStorageSourceNew())) @@ -9402,7 +9402,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctx= t, { VIR_XPATH_NODE_AUTORESTORE(ctxt); xmlNodePtr source; - VIR_AUTOUNREF(virStorageSourcePtr) backingStore =3D NULL; + g_autoptr(virStorageSource) backingStore =3D NULL; g_autofree char *type =3D NULL; g_autofree char *format =3D NULL; g_autofree char *idx =3D NULL; @@ -19526,7 +19526,7 @@ virDomainCachetuneDefParse(virDomainDefPtr def, int ret =3D -1; g_autoptr(virBitmap) vcpus =3D NULL; g_autofree xmlNodePtr *nodes =3D NULL; - VIR_AUTOUNREF(virResctrlAllocPtr) alloc =3D NULL; + g_autoptr(virResctrlAlloc) alloc =3D NULL; =20 ctxt->node =3D node; =20 @@ -19724,7 +19724,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, virDomainResctrlDefPtr resctrl =3D NULL; g_autoptr(virBitmap) vcpus =3D NULL; g_autofree xmlNodePtr *nodes =3D NULL; - VIR_AUTOUNREF(virResctrlAllocPtr) alloc =3D NULL; + g_autoptr(virResctrlAlloc) alloc =3D NULL; ssize_t i =3D 0; int n; =20 @@ -30936,9 +30936,9 @@ virDomainNetCreatePort(virConnectPtr conn, unsigned int flags) { virErrorPtr save_err; - VIR_AUTOUNREF(virNetworkPtr) net =3D NULL; + g_autoptr(virNetwork) net =3D NULL; g_autoptr(virNetworkPortDef) portdef =3D NULL; - VIR_AUTOUNREF(virNetworkPortPtr) port =3D NULL; + g_autoptr(virNetworkPort) port =3D NULL; g_autofree char *portxml =3D NULL; =20 if (!(net =3D virNetworkLookupByName(conn, iface->data.network.name))) @@ -31156,8 +31156,8 @@ virDomainNetResolveActualType(virDomainNetDefPtr if= ace) virNetworkDefPtr def =3D NULL; int ret =3D -1; g_autofree char *xml =3D NULL; - VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; - VIR_AUTOUNREF(virNetworkPtr) net =3D NULL; + g_autoptr(virConnect) conn =3D NULL; + g_autoptr(virNetwork) net =3D NULL; =20 if (iface->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK) return iface->type; @@ -31344,9 +31344,9 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPt= r def) virStorageVolInfo info; g_autoptr(virStoragePoolDef) pooldef =3D NULL; g_autofree char *poolxml =3D NULL; - VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; - VIR_AUTOUNREF(virStoragePoolPtr) pool =3D NULL; - VIR_AUTOUNREF(virStorageVolPtr) vol =3D NULL; + g_autoptr(virConnect) conn =3D NULL; + g_autoptr(virStoragePool) pool =3D NULL; + g_autoptr(virStorageVol) vol =3D NULL; =20 if (def->src->type !=3D VIR_STORAGE_TYPE_VOLUME) return 0; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index b7c80d5c43..cdf925d62c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4100,7 +4100,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const= char *xmlDesc, virDomainSnapshotPtr snapshot =3D NULL; bool diskOnly =3D (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) !=3D = 0; bool quiesce =3D (flags & VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE) !=3D 0; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; + g_autoptr(virDomainSnapshotDef) def =3D NULL; unsigned int parse_flags =3D 0; =20 /* ESX supports disk-only and quiesced snapshots; libvirt tracks no diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 631cfc9a49..64b21f2073 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6539,7 +6539,7 @@ libxlDomainSetMetadata(virDomainPtr dom, unsigned int flags) { libxlDriverPrivatePtr driver =3D dom->conn->privateData; - VIR_AUTOUNREF(libxlDriverConfigPtr) cfg =3D libxlDriverConfigGet(drive= r); + g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); virDomainObjPtr vm =3D NULL; int ret =3D -1; =20 diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 239bf772d5..cda31f8719 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -103,7 +103,7 @@ qemuBlockJobDataPtr qemuBlockJobDataNew(qemuBlockJobType type, const char *name) { - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; =20 if (qemuBlockJobDataInitialize() < 0) return NULL; @@ -206,7 +206,7 @@ qemuBlockJobDiskNew(virDomainObjPtr vm, qemuBlockJobType type, const char *jobname) { - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; =20 if (!(job =3D qemuBlockJobDataNew(type, jobname))) return NULL; @@ -224,7 +224,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm, virStorageSourcePtr base) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; g_autofree char *jobname =3D NULL; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { @@ -255,7 +255,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, virStorageSourcePtr base) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; g_autofree char *jobname =3D NULL; qemuBlockJobType jobtype =3D QEMU_BLOCKJOB_TYPE_COMMIT; =20 @@ -290,7 +290,7 @@ qemuBlockJobNewCreate(virDomainObjPtr vm, virStorageSourcePtr chain, bool storage) { - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; g_autofree char *jobname =3D NULL; const char *nodename =3D src->nodeformat; =20 @@ -323,7 +323,7 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, bool reuse) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; g_autofree char *jobname =3D NULL; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { @@ -595,7 +595,7 @@ qemuBlockJobRewriteConfigDiskSource(virDomainObjPtr vm, virStorageSourcePtr newsrc) { virDomainDiskDefPtr persistDisk =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) copy =3D NULL; + g_autoptr(virStorageSource) copy =3D NULL; virStorageSourcePtr n; =20 if (!vm->newDef) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 7f675d4b79..4b4ad8bb83 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -118,7 +118,7 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver, virDomainMomentObjPtr moment; virDomainCheckpointDefPtr parentdef =3D NULL; size_t i, j; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *chkFile =3D NULL; =20 if (!metadata_only && !virDomainObjIsActive(vm)) { @@ -354,11 +354,11 @@ qemuCheckpointCreateXML(virDomainPtr domain, bool redefine =3D flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; unsigned int parse_flags =3D 0; virDomainMomentObjPtr other =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; + g_autoptr(virCaps) caps =3D NULL; g_autoptr(virJSONValue) actions =3D NULL; int ret; - VIR_AUTOUNREF(virDomainCheckpointDefPtr) def =3D NULL; + g_autoptr(virDomainCheckpointDef) def =3D NULL; =20 virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE, NULL); =20 @@ -532,7 +532,7 @@ qemuCheckpointDelete(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; virDomainMomentObjPtr chk =3D NULL; virQEMUMomentRemove rem; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6829bede99..d5f29ba5d4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6753,7 +6753,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps) { size_t i; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; virCPUDefPtr cpu =3D def->cpu; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) @@ -8337,7 +8337,7 @@ qemuInterfaceVhostuserConnect(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, char **chardev) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -10277,7 +10277,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, size_t i; char uuid[VIR_UUID_STRING_BUFLEN]; g_autoptr(virCommand) cmd =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned int bootHostdevNet =3D 0; qemuDomainObjPrivatePtr priv =3D vm->privateData; virDomainDefPtr def =3D vm->def; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 630e31723a..10d06d7e1c 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -105,7 +105,7 @@ qemuDriverUnlock(virQEMUDriverPtr driver) =20 virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; =20 if (virQEMUConfigInitialize() < 0) return NULL; @@ -1243,7 +1243,7 @@ virQEMUDriverCreateXMLConf(virQEMUDriverPtr driver) virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver) { size_t i, j; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; g_autofree virSecurityManagerPtr *sec_managers =3D NULL; /* Security driver data */ const char *doi, *model, *lbl, *type; @@ -1379,9 +1379,9 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr d= river, virArch arch, virDomainVirtType virttype) { - VIR_AUTOUNREF(virDomainCapsPtr) domCaps =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virDomainCaps) domCaps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virHashTablePtr domCapsCache =3D virQEMUCapsGetDomainCapsCache(qemuCap= s); struct virQEMUDriverSearchDomcapsData data =3D { .path =3D virQEMUCapsGetBinary(qemuCaps), diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e25f5a7ee8..1bda2f5159 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3015,7 +3015,7 @@ qemuDomainObjPrivateXMLParseBlockjobChain(xmlNodePtr = node, g_autofree char *format =3D NULL; g_autofree char *type =3D NULL; g_autofree char *index =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) src =3D NULL; + g_autoptr(virStorageSource) src =3D NULL; xmlNodePtr sourceNode; unsigned int xmlflags =3D VIR_DOMAIN_DEF_PARSE_STATUS; =20 @@ -3161,7 +3161,7 @@ qemuDomainObjPrivateXMLParseBlockjobData(virDomainObj= Ptr vm, { VIR_XPATH_NODE_AUTORESTORE(ctxt); virDomainDiskDefPtr disk =3D NULL; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; g_autofree char *name =3D NULL; g_autofree char *typestr =3D NULL; int type; @@ -3313,7 +3313,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr n= ode, qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); g_autofree char *format =3D NULL; g_autofree char *type =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) migrSource =3D NULL; + g_autoptr(virStorageSource) migrSource =3D NULL; xmlNodePtr sourceNode; =20 ctxt->node =3D node; @@ -8083,7 +8083,7 @@ void qemuDomainSaveConfig(virDomainObjPtr obj) { virQEMUDriverPtr driver =3D QEMU_DOMAIN_PRIVATE(obj)->driver; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainDefPtr def =3D NULL; =20 if (virDomainObjIsActive(obj)) @@ -8911,7 +8911,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, def->cpu && (def->cpu->mode !=3D VIR_CPU_MODE_CUSTOM || def->cpu->model)) { - VIR_AUTOUNREF(virQEMUCapsPtr) qCaps =3D NULL; + g_autoptr(virQEMUCaps) qCaps =3D NULL; =20 if (qemuCaps) { qCaps =3D virObjectRef(qemuCaps); @@ -10263,7 +10263,7 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr drive= r, virStorageSourcePtr disksrc, bool report_broken) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virStorageSourcePtr src; /* iterator for the backing chain declared in= XML */ virStorageSourcePtr n; /* iterator for the backing chain detected from= disk */ qemuDomainObjPrivatePtr priv =3D vm->privateData; @@ -10442,7 +10442,7 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPt= r driver, virStorageSourcePtr src, qemuDomainStorageSourceAccessFlags fla= gs) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *srcstr =3D NULLSTR(src->path); int ret =3D -1; virErrorPtr orig_err =3D NULL; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index beb72f21d1..86d7647628 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -255,7 +255,7 @@ qemuSecurityChownCallback(const virStorageSource *src, int save_errno =3D 0; int ret =3D -1; int rv; - VIR_AUTOUNREF(virStorageSourcePtr) cpy =3D NULL; + g_autoptr(virStorageSource) cpy =3D NULL; =20 rv =3D virStorageFileSupportsSecurityDriver(src); if (rv <=3D 0) @@ -4804,7 +4804,7 @@ processBlockJobEvent(virQEMUDriverPtr driver, int status) { virDomainDiskDefPtr disk; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; =20 if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) return; @@ -13695,7 +13695,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, { int ret =3D VIR_CPU_COMPARE_ERROR; virQEMUDriverPtr driver =3D conn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virQEMUCapsPtr qemuCaps =3D NULL; bool failIncompatible; virCPUDefPtr hvCPU; @@ -13908,7 +13908,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virCPUDefPtr *cpus =3D NULL; virQEMUCapsPtr qemuCaps =3D NULL; virArch arch; @@ -15458,7 +15458,7 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr d= river, qemuDomainObjPrivatePtr priv =3D vm->privateData; char *backingStoreStr; virDomainDiskDefPtr persistdisk; - VIR_AUTOUNREF(virStorageSourcePtr) terminator =3D NULL; + g_autoptr(virStorageSource) terminator =3D NULL; bool supportsCreate; bool supportsBacking; int rc; @@ -15968,7 +15968,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, virCapsPtr caps =3D NULL; qemuDomainObjPrivatePtr priv; virDomainSnapshotState state; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; + g_autoptr(virDomainSnapshotDef) def =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE | VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT | @@ -17970,7 +17970,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, virDomainDiskDefPtr disk; int ret =3D -1; qemuMonitorBlockJobInfo rawInfo; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; =20 virCheckFlags(VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES, -1); =20 @@ -18214,13 +18214,13 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, virDomainDiskDefPtr disk =3D NULL; int ret =3D -1; bool need_unlink =3D false; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *format =3D NULL; bool mirror_reuse =3D !!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT); bool mirror_shallow =3D !!(flags & VIR_DOMAIN_BLOCK_COPY_SHALLOW); bool existing =3D mirror_reuse; qemuBlockJobDataPtr job =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) mirror =3D mirrorsrc; + g_autoptr(virStorageSource) mirror =3D mirrorsrc; bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); bool mirror_initialized =3D false; g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; @@ -18493,7 +18493,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char = *path, const char *base, virDomainObjPtr vm; int ret =3D -1; unsigned long long speed =3D bandwidth; - VIR_AUTOUNREF(virStorageSourcePtr) dest =3D NULL; + g_autoptr(virStorageSource) dest =3D NULL; =20 virCheckFlags(VIR_DOMAIN_BLOCK_REBASE_SHALLOW | VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | @@ -18698,7 +18698,7 @@ qemuDomainBlockCommit(virDomainPtr dom, g_autofree char *backingPath =3D NULL; unsigned long long speed =3D bandwidth; qemuBlockJobDataPtr job =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) mirror =3D NULL; + g_autoptr(virStorageSource) mirror =3D NULL; const char *nodetop =3D NULL; const char *nodebase =3D NULL; bool persistjob =3D false; @@ -20693,7 +20693,7 @@ qemuDomainGetResctrlMonData(virQEMUDriverPtr driver, virDomainResctrlDefPtr resctrl =3D NULL; virQEMUResctrlMonDataPtr res =3D NULL; char **features =3D NULL; - VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; size_t i =3D 0; size_t j =3D 0; =20 diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index b8a17ed1ca..313c909aed 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1028,7 +1028,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, virDomainDefPtr def, const qemuFirmware *fw) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const qemuFirmwareMappingFlash *flash =3D &fw->mapping.data.flash; const qemuFirmwareMappingKernel *kernel =3D &fw->mapping.data.kernel; const qemuFirmwareMappingMemory *memory =3D &fw->mapping.data.memory; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7b3363c0c7..df6f3f9b55 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -584,7 +584,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, virStorageSourcePtr newsrc, bool force) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; virStorageSourcePtr oldsrc =3D disk->src; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); @@ -676,7 +676,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autofree char *devstr =3D NULL; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autoptr(virJSONValue) corProps =3D NULL; g_autofree char *corAlias =3D NULL; bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); @@ -1147,7 +1147,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, bool iface_connected =3D false; virDomainNetType actualType; virNetDevBandwidthPtr actualBandwidth; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainCCWAddressSetPtr ccwaddrs =3D NULL; size_t i; g_autofree char *charDevAlias =3D NULL; @@ -1543,7 +1543,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, bool teardowndevice =3D false; bool teardownmemlock =3D false; int backend; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned int flags =3D 0; =20 if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) @@ -1767,7 +1767,7 @@ qemuDomainAddChardevTLSObjects(virQEMUDriverPtr drive= r, const char **secAlias) { int ret =3D -1; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuDomainChrSourcePrivatePtr chrSourcePriv; qemuDomainSecretInfoPtr secinfo =3D NULL; @@ -1823,7 +1823,7 @@ qemuDomainDelChardevTLSObjects(virQEMUDriverPtr drive= r, virDomainChrSourceDefPtr dev, const char *inAlias) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autofree char *tlsAlias =3D NULL; g_autofree char *secAlias =3D NULL; @@ -2333,7 +2333,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virErrorPtr orig_err; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned long long oldmem =3D virDomainDefGetMemoryTotal(vm->def); unsigned long long newmem =3D oldmem + mem->size; g_autofree char *devstr =3D NULL; @@ -3301,7 +3301,7 @@ qemuDomainAttachLease(virQEMUDriverPtr driver, virDomainLeaseDefPtr lease) { int ret =3D -1; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (virDomainLeaseInsertPreAlloc(vm->def) < 0) goto cleanup; @@ -4012,7 +4012,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virDomainGraphicsDefPtr dev) { virDomainGraphicsDefPtr olddev =3D qemuDomainFindGraphics(vm, dev); - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *type =3D virDomainGraphicsTypeToString(dev->type); size_t i; int ret =3D -1; @@ -4555,7 +4555,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainNetDefPtr net) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autofree char *hostnet_name =3D NULL; g_autofree char *charDevAlias =3D NULL; @@ -6306,7 +6306,7 @@ qemuDomainSetVcpusInternal(virQEMUDriverPtr driver, unsigned int nvcpus, bool hotpluggable) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virBitmapPtr vcpumap =3D NULL; bool enable; int ret =3D -1; @@ -6501,7 +6501,7 @@ qemuDomainSetVcpuInternal(virQEMUDriverPtr driver, virBitmapPtr map, bool state) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virBitmapPtr livevcpus =3D NULL; int ret =3D -1; =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1166236124..b34e47e473 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -797,7 +797,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr= driver, g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); int mon_ret =3D 0; - VIR_AUTOUNREF(virStorageSourcePtr) copysrc =3D NULL; + g_autoptr(virStorageSource) copysrc =3D NULL; =20 VIR_DEBUG("starting blockdev mirror for disk=3D%s to host=3D%s", diskA= lias, host); =20 @@ -991,7 +991,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, unsigned long long mirror_speed =3D speed; bool mirror_shallow =3D *migrate_flags & QEMU_MONITOR_MIGRATE_NON_SHAR= ED_INC; int rv; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 VIR_DEBUG("Starting drive mirrors for domain %s", vm->def->name); =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d21d95a977..b2d07cf279 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -936,7 +936,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon G_GNUC_UNU= SED, virQEMUDriverPtr driver =3D opaque; struct qemuProcessEvent *processEvent =3D NULL; virDomainDiskDefPtr disk; - VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; + g_autoptr(qemuBlockJobData) job =3D NULL; char *data =3D NULL; =20 virObjectLock(vm); @@ -5537,7 +5537,7 @@ static int qemuProcessStartUpdateCustomCaps(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(p= riv->driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); qemuDomainXmlNsDefPtr nsdef =3D vm->def->namespaceData; char **next; int tmp; diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index b4d85c49df..6e6393f49d 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -240,7 +240,7 @@ qemuSlirpStop(qemuSlirpPtr slirp, virDomainNetDefPtr net, bool hot) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *pidfile =3D NULL; g_autofree char *dbus_path =3D NULL; g_autofree char *id =3D qemuSlirpGetDBusVMStateId(net); @@ -296,7 +296,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, bool hotplug, bool incoming) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autoptr(virCommand) cmd =3D NULL; g_autofree char *pidfile =3D NULL; g_autofree char *dbus_path =3D NULL; diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 6daccf170e..49f48c6d08 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -105,7 +105,7 @@ int qemuExtVhostUserGPUStart(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainVideoDefPtr video) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *shortname =3D NULL; g_autofree char *pidfile =3D NULL; g_autoptr(virCommand) cmd =3D NULL; @@ -209,7 +209,7 @@ void qemuExtVhostUserGPUStop(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainVideoDefPtr video) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *pidfile =3D NULL; g_autofree char *shortname =3D NULL; virErrorPtr orig_err; @@ -252,7 +252,7 @@ qemuExtVhostUserGPUSetupCgroup(virQEMUDriverPtr driver, virDomainVideoDefPtr video, virCgroupPtr cgroup) { - VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *shortname =3D NULL; int rc; pid_t pid; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_ba= ckend_gluster.c index 07aca084d8..1b87e800ac 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -239,7 +239,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlu= sterStatePtr state, ssize_t len; int backingFormat; g_autoptr(virStorageVolDef) vol =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) meta =3D NULL; + g_autoptr(virStorageSource) meta =3D NULL; g_autofree char *header =3D NULL; =20 *volptr =3D NULL; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index c51494045d..e97bd2151a 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3359,7 +3359,7 @@ storageBackendProbeTarget(virStorageSourcePtr target, int backingStoreFormat; int rc; struct stat sb; - VIR_AUTOUNREF(virStorageSourcePtr) meta =3D NULL; + g_autoptr(virStorageSource) meta =3D NULL; VIR_AUTOCLOSE fd =3D -1; =20 if (encryption) @@ -3529,7 +3529,7 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr po= ol) int ret =3D -1; g_autoptr(virStorageVolDef) vol =3D NULL; VIR_AUTOCLOSE fd =3D -1; - VIR_AUTOUNREF(virStorageSourcePtr) target =3D NULL; + g_autoptr(virStorageSource) target =3D NULL; =20 if (virDirOpen(&dir, def->target.path) < 0) goto cleanup; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 8c77ec6e0d..42bb3d19f0 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -8558,7 +8558,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain, bool update_current =3D true; bool redefine =3D flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; + g_autoptr(virDomainSnapshotDef) def =3D NULL; =20 /* * DISK_ONLY: Not implemented yet @@ -9042,7 +9042,7 @@ testDomainCheckpointCreateXML(virDomainPtr domain, bool update_current =3D true; bool redefine =3D flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; unsigned int parse_flags =3D 0; - VIR_AUTOUNREF(virDomainCheckpointDefPtr) def =3D NULL; + g_autoptr(virDomainCheckpointDef) def =3D NULL; =20 virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE | VIR_DOMAIN_CHECKPOINT_CREATE_QUIESCE, NULL); diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index dbc235d6f1..5ceadc6026 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -144,7 +144,7 @@ virHostdevManagerDispose(void *obj) static virHostdevManagerPtr virHostdevManagerNew(void) { - VIR_AUTOUNREF(virHostdevManagerPtr) hostdevMgr =3D NULL; + g_autoptr(virHostdevManager) hostdevMgr =3D NULL; bool privileged =3D geteuid() =3D=3D 0; =20 if (!(hostdevMgr =3D virObjectNew(virHostdevManagerClass))) @@ -264,7 +264,7 @@ virHostdevGetPCIHostDevice(const virDomainHostdevDef *h= ostdev, static virPCIDeviceListPtr virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhost= devs) { - VIR_AUTOUNREF(virPCIDeviceListPtr) pcidevs =3D NULL; + g_autoptr(virPCIDeviceList) pcidevs =3D NULL; size_t i; =20 if (!(pcidevs =3D virPCIDeviceListNew())) @@ -713,7 +713,7 @@ virHostdevPreparePCIDevices(virHostdevManagerPtr mgr, int nhostdevs, unsigned int flags) { - VIR_AUTOUNREF(virPCIDeviceListPtr) pcidevs =3D NULL; + g_autoptr(virPCIDeviceList) pcidevs =3D NULL; int last_processed_hostdev_vf =3D -1; size_t i; int ret =3D -1; @@ -985,7 +985,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr, int nhostdevs, const char *oldStateDir) { - VIR_AUTOUNREF(virPCIDeviceListPtr) pcidevs =3D NULL; + g_autoptr(virPCIDeviceList) pcidevs =3D NULL; size_t i; =20 if (!nhostdevs) @@ -1386,7 +1386,7 @@ virHostdevFindUSBDevice(virDomainHostdevDefPtr hostde= v, * automatically found before. */ if (vendor) { - VIR_AUTOUNREF(virUSBDeviceListPtr) devs =3D NULL; + g_autoptr(virUSBDeviceList) devs =3D NULL; =20 rc =3D virUSBDeviceFindByVendor(vendor, product, NULL, mandatory, = &devs); if (rc < 0) { @@ -1442,7 +1442,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr mgr, unsigned int flags) { size_t i; - VIR_AUTOUNREF(virUSBDeviceListPtr) list =3D NULL; + g_autoptr(virUSBDeviceList) list =3D NULL; virUSBDevicePtr tmp; bool coldBoot =3D !!(flags & VIR_HOSTDEV_COLD_BOOT); =20 @@ -1537,7 +1537,7 @@ virHostdevPrepareSCSIDevices(virHostdevManagerPtr mgr, { size_t i, j; int count; - VIR_AUTOUNREF(virSCSIDeviceListPtr) list =3D NULL; + g_autoptr(virSCSIDeviceList) list =3D NULL; virSCSIDevicePtr tmp; =20 if (!nhostdevs) @@ -1632,7 +1632,7 @@ virHostdevPrepareSCSIVHostDevices(virHostdevManagerPt= r mgr, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { - VIR_AUTOUNREF(virSCSIVHostDeviceListPtr) list =3D NULL; + g_autoptr(virSCSIVHostDeviceList) list =3D NULL; virSCSIVHostDevicePtr tmp; size_t i, j; =20 @@ -1718,7 +1718,7 @@ virHostdevPrepareMediatedDevices(virHostdevManagerPtr= mgr, int nhostdevs) { size_t i; - VIR_AUTOUNREF(virMediatedDeviceListPtr) list =3D NULL; + g_autoptr(virMediatedDeviceList) list =3D NULL; =20 if (!nhostdevs) return 0; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 51d80b1cb8..ac0c70b21e 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1129,7 +1129,7 @@ static virStorageSourcePtr virStorageFileMetadataNew(const char *path, int format) { - VIR_AUTOUNREF(virStorageSourcePtr) def =3D NULL; + g_autoptr(virStorageSource) def =3D NULL; virStorageSourcePtr ret =3D NULL; =20 if (!(def =3D virStorageSourceNew())) @@ -1219,7 +1219,7 @@ virStorageFileGetMetadataFromFD(const char *path, struct stat sb; int dummy; g_autofree char *buf =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) meta =3D NULL; + g_autoptr(virStorageSource) meta =3D NULL; =20 if (!backingFormat) backingFormat =3D &dummy; @@ -2251,7 +2251,7 @@ virStorageSourceCopy(const virStorageSource *src, bool backingChain) { virStorageSourcePtr ret =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) def =3D NULL; + g_autoptr(virStorageSource) def =3D NULL; =20 if (!(def =3D virStorageSourceNew())) return NULL; @@ -2629,7 +2629,7 @@ virStorageSourceNewFromBackingRelative(virStorageSour= cePtr parent, { virStorageSourcePtr ret =3D NULL; g_autofree char *dirname =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) def =3D NULL; + g_autoptr(virStorageSource) def =3D NULL; =20 if (!(def =3D virStorageSourceNew())) return NULL; @@ -3681,7 +3681,7 @@ virStorageSourceNewFromBackingAbsolute(const char *pa= th, { const char *json; int rc =3D 0; - VIR_AUTOUNREF(virStorageSourcePtr) def =3D NULL; + g_autoptr(virStorageSource) def =3D NULL; =20 *src =3D NULL; =20 @@ -3748,7 +3748,7 @@ virStorageSourceNewFromChild(virStorageSourcePtr pare= nt, virStorageSourcePtr *child) { struct stat st; - VIR_AUTOUNREF(virStorageSourcePtr) def =3D NULL; + g_autoptr(virStorageSource) def =3D NULL; int rc =3D 0; =20 *child =3D NULL; @@ -3948,7 +3948,7 @@ virStorageSourceUpdateCapacity(virStorageSourcePtr sr= c, bool probe) { int format =3D src->format; - VIR_AUTOUNREF(virStorageSourcePtr) meta =3D NULL; + g_autoptr(virStorageSource) meta =3D NULL; =20 /* Raw files: capacity is physical size. For all other files: if * the metadata has a capacity, use that, otherwise fall back to @@ -4943,7 +4943,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr = src, int backingFormat; int rv; g_autofree char *buf =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) backingStore =3D NULL; + g_autoptr(virStorageSource) backingStore =3D NULL; =20 VIR_DEBUG("path=3D%s format=3D%d uid=3D%u gid=3D%u", src->path, src->format, @@ -5028,7 +5028,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr = src, VIR_STEAL_PTR(src->backingStore, backingStore); =20 if (src->externalDataStoreRaw) { - VIR_AUTOUNREF(virStorageSourcePtr) externalDataStore =3D NULL; + g_autoptr(virStorageSource) externalDataStore =3D NULL; =20 if ((rv =3D virStorageSourceNewFromExternalData(src, &externalDataStore))= < 0) @@ -5121,7 +5121,7 @@ virStorageFileGetBackingStoreStr(virStorageSourcePtr = src, ssize_t headerLen; int rv; g_autofree char *buf =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) tmp =3D NULL; + g_autoptr(virStorageSource) tmp =3D NULL; =20 *backing =3D NULL; =20 diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 50c7de3e02..7fa9a98a1e 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -5477,7 +5477,7 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom, virDomainSnapshotPtr ret =3D NULL; unsigned int parse_flags =3D (VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE); - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; + g_autoptr(virDomainSnapshotDef) def =3D NULL; =20 if (!data->vboxObj) return ret; @@ -6199,7 +6199,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSn= apshotPtr snapshot, char uuidstr[VIR_UUID_STRING_BUFLEN]; char *ret =3D NULL; virDomainDefPtr defdom; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; + g_autoptr(virDomainSnapshotDef) def =3D NULL; =20 if (!data->vboxObj) return ret; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 917acdae57..fe46d6349e 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2595,7 +2595,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, virDomainSnapshotObjListPtr snapshots =3D NULL; virDomainMomentObjPtr current; bool job =3D false; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; + g_autoptr(virDomainSnapshotDef) def =3D NULL; =20 virCheckFlags(VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE, NULL); =20 diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 3bf1271b3e..6d90e2faf5 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -54,8 +54,8 @@ testBackingXMLjsonXML(const void *args) g_autofree char *propsstr =3D NULL; g_autofree char *protocolwrapper =3D NULL; g_autofree char *actualxml =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) xmlsrc =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) jsonsrc =3D NULL; + g_autoptr(virStorageSource) xmlsrc =3D NULL; + g_autoptr(virStorageSource) jsonsrc =3D NULL; =20 if (!(xmlsrc =3D virStorageSourceNew())) return -1; @@ -400,7 +400,7 @@ testQemuImageCreate(const void *opaque) struct testQemuImageCreateData *data =3D (void *) opaque; g_autoptr(virJSONValue) protocolprops =3D NULL; g_autoptr(virJSONValue) formatprops =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) src =3D NULL; + g_autoptr(virStorageSource) src =3D NULL; g_auto(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; g_auto(virBuffer) actualbuf =3D VIR_BUFFER_INITIALIZER; g_autofree char *jsonprotocol =3D NULL; diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomainchec= kpointxml2xmltest.c index 72d1eeaea5..f6eb1f69b2 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -41,7 +41,7 @@ testCompareXMLToXMLFiles(const char *inxml, g_autofree char *inXmlData =3D NULL; g_autofree char *outXmlData =3D NULL; g_autofree char *actual =3D NULL; - VIR_AUTOUNREF(virDomainCheckpointDefPtr) def =3D NULL; + g_autoptr(virDomainCheckpointDef) def =3D NULL; =20 if (flags & TEST_REDEFINE) parseflags |=3D VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index c84ee0bf7d..66cb124f09 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -38,7 +38,7 @@ testCompareXMLToXMLFiles(const char *inxml, unsigned int parseflags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; unsigned int formatflags =3D VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE; bool cur =3D false; - VIR_AUTOUNREF(virDomainSnapshotDefPtr) def =3D NULL; + g_autoptr(virDomainSnapshotDef) def =3D NULL; =20 if (flags & TEST_INTERNAL) { parseflags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL; diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 83719a28f2..288718c2a5 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -40,7 +40,7 @@ prepareObjects(virQEMUDriverPtr driver, virDomainObjPtr *vm_ret) { qemuDomainObjPrivatePtr priv; - VIR_AUTOUNREF(virDomainObjPtr) vm =3D NULL; + g_autoptr(virDomainObj) vm =3D NULL; g_autofree char *filename =3D NULL; g_autofree char *domxml =3D NULL; g_autofree char *latestCapsFile =3D NULL; @@ -84,7 +84,7 @@ static int testDomain(const void *opaque) { const struct testData *data =3D opaque; - VIR_AUTOUNREF(virDomainObjPtr) vm =3D NULL; + g_autoptr(virDomainObj) vm =3D NULL; VIR_AUTOSTRINGLIST notRestored =3D NULL; size_t i; int ret =3D -1; diff --git a/tests/storagepoolcapstest.c b/tests/storagepoolcapstest.c index 185372e939..6b0680291e 100644 --- a/tests/storagepoolcapstest.c +++ b/tests/storagepoolcapstest.c @@ -54,7 +54,7 @@ test_virStoragePoolCapsFormat(const void *opaque) struct test_virStoragePoolCapsFormatData *data =3D (struct test_virStoragePoolCapsFormatData *) opaque; virCapsPtr driverCaps =3D data->driverCaps; - VIR_AUTOUNREF(virStoragePoolCapsPtr) poolCaps =3D NULL; + g_autoptr(virStoragePoolCaps) poolCaps =3D NULL; g_autofree char *path =3D NULL; g_autofree char *poolCapsXML =3D NULL; =20 @@ -81,8 +81,8 @@ static int mymain(void) { int ret =3D 0; - VIR_AUTOUNREF(virCapsPtr) fullCaps =3D NULL; - VIR_AUTOUNREF(virCapsPtr) fsCaps =3D NULL; + g_autoptr(virCaps) fullCaps =3D NULL; + g_autoptr(virCaps) fsCaps =3D NULL; =20 #define DO_TEST(Filename, DriverCaps) \ do { \ diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 6cec458088..33ef662115 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -86,7 +86,7 @@ testStorageFileGetMetadata(const char *path, { struct stat st; virStorageSourcePtr ret =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) def =3D NULL; + g_autoptr(virStorageSource) def =3D NULL; =20 if (!(def =3D virStorageSourceNew())) return NULL; @@ -278,7 +278,7 @@ testStorageChain(const void *args) const struct testChainData *data =3D args; virStorageSourcePtr elt; size_t i =3D 0; - VIR_AUTOUNREF(virStorageSourcePtr) meta =3D NULL; + g_autoptr(virStorageSource) meta =3D NULL; g_autofree char *broken =3D NULL; =20 meta =3D testStorageFileGetMetadata(data->start, data->format, -1, -1); @@ -612,7 +612,7 @@ testBackingParse(const void *args) const struct testBackingParseData *data =3D args; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *xml =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) src =3D NULL; + g_autoptr(virStorageSource) src =3D NULL; int rc; int erc =3D data->rv; =20 @@ -664,7 +664,7 @@ mymain(void) virStorageSourcePtr chain2; /* short for chain->backingStore */ virStorageSourcePtr chain3; /* short for chain2->backingStore */ g_autoptr(virCommand) cmd =3D NULL; - VIR_AUTOUNREF(virStorageSourcePtr) chain =3D NULL; + g_autoptr(virStorageSource) chain =3D NULL; =20 if (storageRegisterAll() < 0) return EXIT_FAILURE; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list