From nobody Sun Feb 8 13:09:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578594863; cv=none; d=zohomail.com; s=zohoarc; b=a9jmLd0ruf8VtewrBvPphQDHhECG2KeItUdGsaC0o0mcmJyTSvhRLhe2irSuCOgxcql2lgi+/Bg3YjeB9+JdB7N9Rn/+FMGBAkknOTH/f/mx2V0Y6K9lVywtvQ0EtqSNwx7FWyhWP492lz//wKuDk/Mv8aFhdEs9llrhVJHDjAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594863; h=Content-Type:Content-Transfer-Encoding:Cc: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=I/olIRXKeaoOSSoet/DVhVK4iQUBuDj3sIKjOFR2L2k=; b=lbG3kcYeiSjTYN6INE8xwRUZg6wMdkbzorJuUeXnGdd+96v38Znq4ycOZ5K28hFU+Pl3WWmuZjMZnt875tkGJ8qFSMk5n2rLkozgk00TKIqb3uwavh5OddBRa1VGH5ceBau3zlB3GW7REoJlOjgTydU9ID7JVn+l252kYdTYLgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578594863543648.9961160681312; Thu, 9 Jan 2020 10:34:23 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-32-t4mWvK6ZPwuzrS5q5ui32A-1; Thu, 09 Jan 2020 13:34:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 13FCC8024E7; Thu, 9 Jan 2020 18:34:12 +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 D746160FC6; Thu, 9 Jan 2020 18:34:11 +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 85081503CE; Thu, 9 Jan 2020 18:34:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY5dP019818 for ; Thu, 9 Jan 2020 13:34:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id 76BFB2166B28; Thu, 9 Jan 2020 18:34:05 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7081D2166B27 for ; Thu, 9 Jan 2020 18:34:05 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 482151019288 for ; Thu, 9 Jan 2020 18:34:05 +0000 (UTC) Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-207-lT0EqNHeM7ivfbYiMSAQ_A-1; Thu, 09 Jan 2020 13:34:03 -0500 Received: by mail-qt1-f181.google.com with SMTP id v25so4868862qto.7 for ; Thu, 09 Jan 2020 10:34:03 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.34.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:34:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594862; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=I/olIRXKeaoOSSoet/DVhVK4iQUBuDj3sIKjOFR2L2k=; b=FYHQPjx6/2yElLle9ZL7PbEYH917ox/to/S5+RimPChx35S+dgorODdNSntzABJJGUAuyu Xwstg5l5fr9Gb9tsCPJnEjYs4XEDI9aF7U+bSpcbI87494TEumxwTqIn5ImzrB0bqZg0Cq XGvDQncUK+IWpfRO37Bbd/Mxa7PxazE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KOryB4xn0EOaSyNclSetf6aRz7mR6qkVv2gVYpqM/i0=; b=SmFNKtsW67vU0wUAtspcBeghDqwXupKmdhnfRiKtVbCeilM9kj79tzrKbWSAerbeER gdvqthujH1DLuNnUQH7WYWfOeoqDErmvAH6lYiX4NDo4bESAvNDYRZD61Dkvf6vY4H9i NrtiMJPHix/i3TQHI2PUTHLkJZMPT4afZfWFFhpU1MYe1zcXt7smpyc/+meoOvN5b4Un /R6v38DEQL8qE2qg3HVG+TWJDnmr/u0APimmlF4QrUVGJQBZCqB2JaRxRzgAKbxSduzU KexwxRmgjswA/7O6T+7KD9wlMDJLbL1lmiBHiakgfCIfnNJf8HPOBt9q2MB8D+8PkTFS jn8w== X-Gm-Message-State: APjAAAUuv6AKTp1sNm+zag3a5S+0VwXTtihe1gP9/xRMs209C1b25v+F AKEkBt1no+B3/gey5q5dXxLfa6MxX9U= X-Google-Smtp-Source: APXvYqyt8qUTxGc318N+OQsKe42WXtPUnZIjsY/PA30r8SsArE/t4Ev8K15FCGYO4ut4CtS6vxHp+Q== X-Received: by 2002:ac8:2bcd:: with SMTP id n13mr9372256qtn.21.1578594842695; Thu, 09 Jan 2020 10:34:02 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:45 -0300 Message-Id: <20200109183348.1362138-6-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: lT0EqNHeM7ivfbYiMSAQ_A-1 X-MC-Unique: t4mWvK6ZPwuzrS5q5ui32A-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY5dP019818 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 5/8] qemu_domain.c: use g_autoptr when possible 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Avoid some of the virObjectUnref() calls by using g_autoptr. Aside from the 'cleanup' label in qemuDomainSetFakeReboot(), all other now deprecated cleanup labels will be removed in the next patch. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_domain.c | 87 ++++++++++++------------------------------ 1 file changed, 25 insertions(+), 62 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d76c6e0c0e..6bf704a6f5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1497,10 +1497,9 @@ qemuDomainSecretPlainSetup(qemuDomainSecretInfoPtr s= ecinfo, const char *username, virSecretLookupTypeDefPtr seclookupdef) { - virConnectPtr conn; + g_autoptr(virConnect) conn =3D virGetConnectSecret(); int ret =3D -1; =20 - conn =3D virGetConnectSecret(); if (!conn) return -1; =20 @@ -1511,7 +1510,6 @@ qemuDomainSecretPlainSetup(qemuDomainSecretInfoPtr se= cinfo, &secinfo->s.plain.secret, &secinfo->s.plain.secretlen); =20 - virObjectUnref(conn); return ret; } =20 @@ -1538,7 +1536,7 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv, virSecretLookupTypeDefPtr seclookupdef, bool isLuks) { - virConnectPtr conn; + g_autoptr(virConnect) conn =3D virGetConnectSecret(); int ret =3D -1; uint8_t *raw_iv =3D NULL; size_t ivlen =3D QEMU_DOMAIN_AES_IV_LEN; @@ -1547,7 +1545,6 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv, uint8_t *ciphertext =3D NULL; size_t ciphertextlen =3D 0; =20 - conn =3D virGetConnectSecret(); if (!conn) return -1; =20 @@ -1591,7 +1588,6 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivatePtr priv, VIR_DISPOSE_N(raw_iv, ivlen); VIR_DISPOSE_N(secret, secretlen); VIR_DISPOSE_N(ciphertext, ciphertextlen); - virObjectUnref(conn); return ret; } =20 @@ -2036,7 +2032,7 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i; int ret =3D -1; =20 @@ -2107,7 +2103,6 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -2118,7 +2113,7 @@ qemuDomainSetPrivatePathsOld(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (!priv->libDir) priv->libDir =3D g_strdup_printf("%s/domain-%s", cfg->libDir, vm->= def->name); @@ -2126,8 +2121,6 @@ qemuDomainSetPrivatePathsOld(virQEMUDriverPtr driver, if (!priv->channelTargetDir) priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", cfg->channelTargetDir, vm= ->def->name); - - virObjectUnref(cfg); } =20 =20 @@ -2135,7 +2128,7 @@ int qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, virDomainObjPtr vm) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D vm->privateData; g_autofree char *domname =3D virDomainDefGetShortName(vm->def); int ret =3D -1; @@ -2152,7 +2145,6 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -3646,7 +3638,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, size_t i; g_autofree xmlNodePtr *nodes =3D NULL; xmlNodePtr node =3D NULL; - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; =20 if (!(priv->monConfig =3D virDomainChrSourceDefNew(NULL))) goto error; @@ -3850,7 +3842,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->monConfig =3D NULL; virStringListFree(priv->qemuDevices); priv->qemuDevices =3D NULL; - virObjectUnref(qemuCaps); return -1; } =20 @@ -5671,8 +5662,8 @@ qemuDomainDefValidate(const virDomainDef *def, void *opaque) { virQEMUDriverPtr driver =3D opaque; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - virQEMUCapsPtr qemuCaps =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUCaps) qemuCaps =3D NULL; int ret =3D -1; size_t i; =20 @@ -5878,8 +5869,6 @@ qemuDomainDefValidate(const virDomainDef *def, ret =3D 0; =20 cleanup: - virObjectUnref(qemuCaps); - virObjectUnref(cfg); return ret; } =20 @@ -8526,7 +8515,7 @@ static int qemuDomainChrDefDropDefaultPath(virDomainChrDefPtr chr, virQEMUDriverPtr driver) { - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virBuffer buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *regexp =3D NULL; int ret =3D -1; @@ -8550,7 +8539,6 @@ qemuDomainChrDefDropDefaultPath(virDomainChrDefPtr ch= r, VIR_FREE(chr->source->data.nix.path); =20 ret =3D 0; - virObjectUnref(cfg); return ret; } =20 @@ -9207,14 +9195,12 @@ static void qemuDomainObjSaveStatus(virQEMUDriverPtr driver, virDomainObjPtr obj) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (virDomainObjIsActive(obj)) { if (virDomainObjSave(obj, driver->xmlopt, cfg->stateDir) < 0) VIR_WARN("Failed to save status on vm %s", obj->def->name); } - - virObjectUnref(cfg); } =20 =20 @@ -9375,7 +9361,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, unsigned long long then; bool nested =3D job =3D=3D QEMU_JOB_ASYNC_NESTED; bool async =3D job =3D=3D QEMU_JOB_ASYNC; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *blocker =3D NULL; const char *agentBlocker =3D NULL; int ret =3D -1; @@ -9393,10 +9379,8 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr drive= r, qemuDomainAgentJobTypeToString(priv->job.agentActive), qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); =20 - if (virTimeMillisNow(&now) < 0) { - virObjectUnref(cfg); + if (virTimeMillisNow(&now) < 0) return -1; - } =20 priv->jobs_queued++; then =3D now + QEMU_JOB_WAIT_TIME; @@ -9478,7 +9462,6 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, if (qemuDomainTrackJob(job)) qemuDomainObjSaveStatus(driver, obj); =20 - virObjectUnref(cfg); return 0; =20 error: @@ -9570,7 +9553,6 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, =20 cleanup: priv->jobs_queued--; - virObjectUnref(cfg); return ret; } =20 @@ -10369,7 +10351,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr drive= r, qemuDomainLogContextPtr logCtxt) { size_t i; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv =3D obj->privateData; bool custom_hypervisor_feat =3D false; =20 @@ -10410,8 +10392,6 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr drive= r, =20 if (obj->def->os.dtb) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CUSTOM_DTB, logCt= xt); - - virObjectUnref(cfg); } =20 =20 @@ -10420,7 +10400,7 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr d= river, virDomainDiskDefPtr disk, qemuDomainLogContextPtr logCtxt) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (disk->rawio =3D=3D VIR_TRISTATE_BOOL_YES) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES, @@ -10431,8 +10411,6 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr d= river, disk->src->path && virFileIsCDROM(disk->src->path) =3D=3D 1) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH, logCtxt); - - virObjectUnref(cfg); } =20 =20 @@ -10468,7 +10446,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(vir= QEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainLogContextMode m= ode) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainLogContextPtr ctxt =3D NULL; =20 if (qemuDomainInitialize() < 0) @@ -10542,7 +10520,6 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(vir= QEMUDriverPtr driver, } =20 cleanup: - virObjectUnref(cfg); return ctxt; =20 error: @@ -10643,7 +10620,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, const char *fmt, ...) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virLogManagerPtr manager =3D NULL; va_list ap; g_autofree char *path =3D NULL; @@ -10684,7 +10661,6 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, va_end(ap); VIR_FORCE_CLOSE(writefd); virLogManagerFree(manager); - virObjectUnref(cfg); =20 return ret; } @@ -10868,7 +10844,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, int ret =3D -1; qemuDomainObjPrivatePtr priv; virDomainMomentObjPtr parentsnap =3D NULL; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (!metadata_only) { if (!virDomainObjIsActive(vm)) { @@ -10918,7 +10894,6 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -10962,12 +10937,10 @@ static void qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, virDomainObjPtr vm) { - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *snapDir =3D NULL; g_autofree char *chkDir =3D NULL; =20 - cfg =3D virQEMUDriverGetConfig(driver); - /* Remove any snapshot metadata prior to removing the domain */ if (qemuDomainSnapshotDiscardAllMetadata(driver, vm) < 0) { VIR_WARN("unable to remove all snapshots for domain %s", @@ -10989,8 +10962,6 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr dri= ver, VIR_WARN("unable to remove checkpoint directory %s", chkDir); } qemuExtDevicesCleanupHost(driver, vm->def); - - virObjectUnref(cfg); } =20 =20 @@ -11086,18 +11057,15 @@ qemuDomainSetFakeReboot(virQEMUDriverPtr driver, bool value) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (priv->fakeReboot =3D=3D value) - goto cleanup; + return; =20 priv->fakeReboot =3D value; =20 if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); - - cleanup: - virObjectUnref(cfg); } =20 static void @@ -11304,7 +11272,7 @@ qemuDomainStorageFileInit(virQEMUDriverPtr driver, virStorageSourcePtr src, virStorageSourcePtr parent) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); uid_t uid; gid_t gid; int ret =3D -1; @@ -11317,7 +11285,6 @@ qemuDomainStorageFileInit(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -15026,7 +14993,7 @@ int qemuDomainCreateNamespace(virQEMUDriverPtr driver, virDomainObjPtr vm) { - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; =20 if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) && @@ -15035,7 +15002,6 @@ qemuDomainCreateNamespace(virQEMUDriverPtr driver, =20 ret =3D 0; cleanup: - virObjectUnref(cfg); return ret; } =20 @@ -15240,7 +15206,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverP= tr driver, size_t ndevMountsPath, unsigned int ttl) { - virQEMUDriverConfigPtr cfg =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; struct qemuDomainAttachDeviceMknodData data; int ret =3D -1; g_autofree char *target =3D NULL; @@ -15363,7 +15329,6 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverP= tr driver, virFileFreeACLs(&data.acl); if (isReg && target) umount(target); - virObjectUnref(cfg); return ret; } =20 @@ -15456,7 +15421,7 @@ qemuDomainNamespaceMknodPaths(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; char **devMountsPath =3D NULL; size_t ndevMountsPath =3D 0; int ret =3D -1; @@ -15483,7 +15448,6 @@ qemuDomainNamespaceMknodPaths(virDomainObjPtr vm, ret =3D 0; cleanup: virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); return ret; } =20 @@ -15505,7 +15469,7 @@ qemuDomainNamespaceUnlinkPaths(virDomainObjPtr vm, { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverPtr driver =3D priv->driver; - virQEMUDriverConfigPtr cfg; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; char **devMountsPath =3D NULL; size_t ndevMountsPath =3D 0; size_t i; @@ -15531,7 +15495,6 @@ qemuDomainNamespaceUnlinkPaths(virDomainObjPtr vm, ret =3D 0; cleanup: virStringListFreeCount(devMountsPath, ndevMountsPath); - virObjectUnref(cfg); return ret; } =20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list