From nobody Sun Feb 8 05:26:59 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1571170866; cv=none; d=zoho.com; s=zohoarc; b=N5+193IafegsatlIZ32vzcF/ipO98GSZEUx9t9FFM76w5lEkxfx6+iIK6TEE4WqPJr5dp0YcFkeoMqSUmDh2Hi3WtiF8j9cGjIqPLaevmFzkuorUkexZsSJGoWeaGkhbSv/fwOu9NZoHXOzrRLACwgeqcPa8SDgZtFsWAybnquw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571170866; 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=/hRUacgz0hfx1neTHcdSi80DP5dIBGWuwtj1I6V+Lqo=; b=T3anbG+UfYk4Trss2/9XW3l5mDf+EUVZsBr8D/iXMuPA26exgk74F1hkdr2vdAfgW/9VGCvJkgxGIgj+/GIlMmCSe04EEG++s26DA41JAJcuAJ+zojwalL7OJzQ05i3u0jcbr/Qzb4MgvCuUZRe1soUDF7MUj2xdUtdhnI62pzQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 1571170865996616.2897893979479; Tue, 15 Oct 2019 13:21:05 -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 71C2C10C093C; Tue, 15 Oct 2019 20:21:04 +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 495E1608C2; Tue, 15 Oct 2019 20:21:04 +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 0A4E583549; Tue, 15 Oct 2019 20:21:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FK9ERJ010252 for ; Tue, 15 Oct 2019 16:09:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 25E325C541; Tue, 15 Oct 2019 20:09:14 +0000 (UTC) Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8EB775C231; Tue, 15 Oct 2019 20:09:11 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8E46F3090FCD; Tue, 15 Oct 2019 20:09:10 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id t20so27152984qtr.10; Tue, 15 Oct 2019 13:09:10 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c7:d25e:a983:2b3:2523:a41]) by smtp.gmail.com with ESMTPSA id t199sm10089455qke.36.2019.10.15.13.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 13:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7oMwDB+XxyxzrakwrIkrol12h2qzghbLrjK0InZ1rzU=; b=b+EusPPXu27iR/lKHmMaJjvum5/pCJv9n/ubAzhriyVmJIAKzJa6URC1dMA3gInDlN Gsdck5Wg1epgBNdS9Xi8+lIBbCQvqotUZdJXI8NabDh719yTCJVNsAN8Cli6q6KMtmJ2 /fJE9A3c7+8WbDIwzseD6nZ182eWuUg0CFgM74XywqfA60SsGSJeMCPqmuXRIWhE7Thw dQQgCGhm9qbV/CNs8Olq/sUjuWgHpooeZzHZvq2aoTCGA4PokjMbFFfosLF3cfs8OZPp xaYYUDGy9WtgDaMMV15v/Vhi2xtXc5uWWinp1PGpKQDgJ0nPdeO/NKvG29DOPHyPlEYQ fJVg== 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=7oMwDB+XxyxzrakwrIkrol12h2qzghbLrjK0InZ1rzU=; b=W8CIYsDqGWSYDi4AVlr0Egn/wGLAzAqD4bSEG5NeE770Wo4Y8mxdd9afsuskky2s/V fng5NGbzoXw2MrPHNDfGwsQQKmj3gus/4db2kiot6/kn2S7q1WN/xEnlkpImXOZSf1PS WIys+/IFCR7v7tJWfYlJBE93YbI9Y9s9RU2O65rizZcgBTQC7o6tA3KUOPyxj11CucY+ lHbkcLBDyD6Wb4/cCIT88RytPo0EXZgau1VJoWKmYiL7J4tuMp1knHmm2Jb8pAqAuA5+ LqcWPLwoeJwrgGWNZQ8aE4gu2qFRn7n+nJkySxxQ3DnXhvQNww+hDmJ+AzlKH//odvF8 w9Jw== X-Gm-Message-State: APjAAAV8R+nl1bYwuZkL5pPpAIf/4VI9Z75I3NTH0tV5f8v5pR9/sgEl FHfB6za38Zg4PcauCqcEQd182RZs X-Google-Smtp-Source: APXvYqwTPcLu9uSmYSRAJOrcyMYLrcjZHx5wyDQD9lfr0FLwbWYfNGx8o249C2e0Gw1Ymun+4UT9YQ== X-Received: by 2002:aed:3ec8:: with SMTP id o8mr41177587qtf.386.1571170149615; Tue, 15 Oct 2019 13:09:09 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 17:08:47 -0300 Message-Id: <20191015200852.15778-6-danielhb413@gmail.com> In-Reply-To: <20191015200852.15778-1-danielhb413@gmail.com> References: <20191015200852.15778-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 20:09:10 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 15 Oct 2019 20:09:10 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.153 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.43 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , eskultet@redhat.com Subject: [libvirt] [PATCH v3 05/10] qemu_driver: use VIR_AUTOUNREF() with more pointer types X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 15 Oct 2019 20:21:04 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch uses VIR_AUTOUNREF() with the following pointer types: - virQEMUCapsPtr - virConnect - qemuDomainSaveCookiePtr - virDomainCapsPtr - qemuBlockJobDataPtr* - virNetworkPtr - virSecurityManagerPtr 'cleanup' labels were deleted when possible. * instances being cleaned up with qemuBlockJobStartupFinalize() weren't changed, since qemuBlockJobStartupFinalize() will unref the object after qemuBlockJobUnregister(). Suggested-by: Erik Skultety Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 64 +++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 99923b0ab6..d95c5c5b81 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -305,8 +305,8 @@ static int qemuSecurityInit(virQEMUDriverPtr driver) { char **names; - virSecurityManagerPtr mgr =3D NULL; - virSecurityManagerPtr stack =3D NULL; + VIR_AUTOUNREF(virSecurityManagerPtr) mgr =3D NULL; + VIR_AUTOUNREF(virSecurityManagerPtr) stack =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); unsigned int flags =3D 0; =20 @@ -372,8 +372,6 @@ qemuSecurityInit(virQEMUDriverPtr driver) error: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to initialize security drivers")); - virObjectUnref(stack); - virObjectUnref(mgr); return -1; } =20 @@ -1098,7 +1096,7 @@ static int qemuStateStop(void) { int ret =3D -1; - virConnectPtr conn; + VIR_AUTOUNREF(virConnectPtr) conn =3D NULL; int numDomains =3D 0; size_t i; int state; @@ -1142,7 +1140,6 @@ qemuStateStop(void) VIR_FREE(domains); } VIR_FREE(flags); - virObjectUnref(conn); =20 return ret; } @@ -3310,7 +3307,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; VIR_AUTOUNREF(virCapsPtr) caps =3D NULL; virQEMUSaveDataPtr data =3D NULL; - qemuDomainSaveCookiePtr cookie =3D NULL; + VIR_AUTOUNREF(qemuDomainSaveCookiePtr) cookie =3D NULL; =20 if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -3419,7 +3416,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); =20 cleanup: - virObjectUnref(cookie); VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); @@ -6866,7 +6862,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, char *errbuf =3D NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virQEMUSaveHeaderPtr header =3D &data->header; - qemuDomainSaveCookiePtr cookie =3D NULL; + VIR_AUTOUNREF(qemuDomainSaveCookiePtr) cookie =3D NULL; =20 if (virSaveCookieParseString(data->cookie, (virObjectPtr *)&cookie, virDomainXMLOptionGetSaveCookie(driver->x= mlopt)) < 0) @@ -6981,7 +6977,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, ret =3D 0; =20 cleanup: - virObjectUnref(cookie); virCommandFree(cmd); VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) @@ -13588,7 +13583,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, int ret =3D VIR_CPU_COMPARE_ERROR; virQEMUDriverPtr driver =3D conn->privateData; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; bool failIncompatible; virCPUDefPtr hvCPU; virCPUDefPtr cpu =3D NULL; @@ -13642,7 +13637,6 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, =20 cleanup: virCPUDefFree(cpu); - virObjectUnref(qemuCaps); return ret; } =20 @@ -13802,7 +13796,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, virQEMUDriverPtr driver =3D conn->privateData; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); virCPUDefPtr *cpus =3D NULL; - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; virDomainCapsCPUModelsPtr cpuModels; @@ -13881,7 +13875,6 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, cleanup: virCPUDefListFree(cpus); virCPUDefFree(cpu); - virObjectUnref(qemuCaps); virStringListFree(features); =20 return cpustr; @@ -17689,7 +17682,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); bool pivot =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT); bool async =3D !!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC); - qemuBlockJobDataPtr job =3D NULL; + VIR_AUTOUNREF(qemuBlockJobDataPtr) job =3D NULL; virDomainObjPtr vm; qemuDomainObjPrivatePtr priv =3D NULL; bool blockdev =3D false; @@ -17790,7 +17783,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virObjectUnref(job); virDomainObjEndAPI(&vm); return ret; } @@ -20460,17 +20452,16 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, const char *virttype_str, unsigned int flags) { - char *ret =3D NULL; virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; - virDomainCapsPtr domCaps =3D NULL; + VIR_AUTOUNREF(virDomainCapsPtr) domCaps =3D NULL; =20 - virCheckFlags(0, ret); + virCheckFlags(0, NULL); =20 if (virConnectGetDomainCapabilitiesEnsureACL(conn) < 0) - return ret; + return NULL; =20 qemuCaps =3D virQEMUCapsCacheLookupDefault(driver->qemuCapsCache, emulatorbin, @@ -20479,18 +20470,14 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, machine, &arch, &virttype, &machine); if (!qemuCaps) - goto cleanup; + return NULL; =20 if (!(domCaps =3D virQEMUDriverGetDomainCapabilities(driver, qemuCaps, machine, arch, virttype))) - goto cleanup; + return NULL; =20 - ret =3D virDomainCapsFormat(domCaps); - cleanup: - virObjectUnref(domCaps); - virObjectUnref(qemuCaps); - return ret; + return virDomainCapsFormat(domCaps); } =20 =20 @@ -21733,7 +21720,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom, int n_leases =3D 0; size_t i, j; size_t ifaces_count =3D 0; - virNetworkPtr network =3D NULL; + VIR_AUTOUNREF(virNetworkPtr) network =3D NULL; char macaddr[VIR_MAC_STRING_BUFLEN]; virDomainInterfacePtr iface =3D NULL; virNetworkDHCPLeasePtr *leases =3D NULL; @@ -21801,7 +21788,6 @@ qemuGetDHCPInterfaces(virDomainPtr dom, rv =3D ifaces_count; =20 cleanup: - virObjectUnref(network); if (leases) { for (i =3D 0; i < n_leases; i++) virNetworkDHCPLeaseFree(leases[i]); @@ -22596,32 +22582,26 @@ qemuNodeGetSEVInfo(virConnectPtr conn, unsigned int flags) { virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemucaps =3D NULL; - int ret =3D -1; + VIR_AUTOUNREF(virQEMUCapsPtr) qemucaps =3D NULL; =20 if (virNodeGetSevInfoEnsureACL(conn) < 0) - return ret; + return -1; =20 qemucaps =3D virQEMUCapsCacheLookupByArch(driver->qemuCapsCache, virArchFromHost()); if (!qemucaps) - goto cleanup; + return -1; =20 if (!virQEMUCapsGet(qemucaps, QEMU_CAPS_SEV_GUEST)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("QEMU does not support SEV guest")); - goto cleanup; + return -1; } =20 if (qemuGetSEVInfoToParams(qemucaps, params, nparams, flags) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: - virObjectUnref(qemucaps); + return -1; =20 - return ret; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list