From nobody Sat Feb 7 15:15:27 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=1569865717; cv=none; d=zoho.com; s=zohoarc; b=ciiAIckZVbEUXvjv0Q4dqt1FKHTWPFTJy6/NI0uvqo8p41DDIY3b1t+abqSES7YZ75wvbdLOnXm3Vdp4GkRifZC8eq3BQP4+8025SeojCGeIkGcTMNiFZR2afObfEhCwwNv495CI+u8ahC6WvhP6pKOM7y8Qi3z3Jw3X4kzY+OY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569865717; 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:ARC-Authentication-Results; bh=XB4Fb/OlMel3HDSEJD0KagyyJes1I2sQYjAk5+Pg4C8=; b=hdqpDpNPEsOjVOeNKT3WVCxc8TX/W8wdHAiuEYrVSM7raibtGBPE36BMUFkUuLAEQqHBl82g6/Wb4dkJ7fJJeBZmVbjdzrwBJjRUt9Dy/PFq5EzLLqeOC7Cpj+Thu0o1wubnCbVqDyIzKKGidCKIbW4ATP+wmesnz3cZ5mnUWlM= 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 1569865717077847.9510720796475; Mon, 30 Sep 2019 10:48:37 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4600358569; Mon, 30 Sep 2019 17:48:35 +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 205FA5D71C; Mon, 30 Sep 2019 17:48:35 +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 D509D4EE6A; Mon, 30 Sep 2019 17:48:34 +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 x8UHmPK0029225 for ; Mon, 30 Sep 2019 13:48:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 99C765C224; Mon, 30 Sep 2019 17:48:25 +0000 (UTC) Received: from mx1.redhat.com (ext-mx30.extmail.prod.ext.phx2.redhat.com [10.5.110.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 536CD5C223; Mon, 30 Sep 2019 17:48:23 +0000 (UTC) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) (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 0D1077F746; Mon, 30 Sep 2019 17:48:22 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id f16so8560718qkl.9; Mon, 30 Sep 2019 10:48:22 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:2a15:38ab:f72b:e1c1:67e7]) by smtp.gmail.com with ESMTPSA id v26sm10204538qta.88.2019.09.30.10.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 10:48:20 -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=7WVGHpJlYTU25HZC+opfau8VkrvzatezRFpIeEMksME=; b=mAtkfyhezwxubxe5mTXyjBSBaksPP6rMryQWgnvEMKRkPRiDfBW9hHrpfmIy7jla7l 0HdneiQ5LtYj/WvVPHw3qB/zabbPdCSdTpV8TDVj0K7RHNSj9APkrys+BmUfHcRACNjr qBIfZqD5SGAu/KfaoZVEXO5VlSUwtBvbshu2fnLojnCOgF3xwZh8XxZMvR+C/Hf7BBNR j3OCaSAeR8YAABoB4/68erJsjDidxA01GLgciuAfclYKi0LX/kEDEVNU/JFVyX3BOFcI T6GL3eaFGTrc1OybHPqZXJEn895eR6KO68G/YxZLvALkNbp88pjwaOO7dM7aHvnTZ8Jt WKBg== 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=7WVGHpJlYTU25HZC+opfau8VkrvzatezRFpIeEMksME=; b=ju9QzLBUFj5CUqhLb0D8O+5W/Y7vDFHnLhxzNXgrUy1ioplDBSrtpvSPQ+WDgWp7Dv moNh7XXPyCEdvkC/OzWBRnvkwe1wyTQdFhffVcCgZHWw5QN4M1nkzdwGeI9APVn5HCZH csCdMv6wY/Fg6VJ1m1J/XweUIgVHRTBlM+gbVmje1oItFzo0hBTakhD+Gkn0/J8i6bxj X4yJnQ9wNXP7UOPdj6rG9TgYvRdxXYMo4YBuUoBocl7TI0r0lw4n2suX9m/uz5L8f0I1 0tXanKZybeRgXQ2gAPrxnO3UI3SWzkIpddwfGBAsR1584cNPnD61wxN7KL58XfwyOZfU WoUg== X-Gm-Message-State: APjAAAUl8OY0Lj3pgmiw3a/5gFV21Cv/03MrVwgizZazq5/JR+0NU8ik /LzZCky5Oz7ZI8TQZvQAGKTVjDWXFCQ= X-Google-Smtp-Source: APXvYqw8j765JZRGAncJakHaX0il+p4FMQ5g4F3a5MJsZsPezNug9t4xSeBldEg28ohmpKKTv434Og== X-Received: by 2002:a37:6789:: with SMTP id b131mr1344751qkc.358.1569865701109; Mon, 30 Sep 2019 10:48:21 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:47:58 -0300 Message-Id: <20190930174802.22426-6-danielhb413@gmail.com> In-Reply-To: <20190930174802.22426-1-danielhb413@gmail.com> References: <20190930174802.22426-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 30 Sep 2019 17:48:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 30 Sep 2019 17:48:22 +0000 (UTC) for IP:'209.85.222.195' DOMAIN:'mail-qk1-f195.google.com' HELO:'mail-qk1-f195.google.com' FROM:'danielhb413@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.15 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS) 209.85.222.195 mail-qk1-f195.google.com 209.85.222.195 mail-qk1-f195.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.71 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 v2 5/9] 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 30 Sep 2019 17:48:35 +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 | 76 +++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9958164788..48eca00777 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 @@ -1093,7 +1091,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; @@ -1137,7 +1135,6 @@ qemuStateStop(void) VIR_FREE(domains); } VIR_FREE(flags); - virObjectUnref(conn); =20 return ret; } @@ -3305,7 +3302,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; @@ -3414,7 +3411,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); =20 cleanup: - virObjectUnref(cookie); VIR_FREE(xml); virQEMUSaveDataFree(data); virObjectEventStateQueue(driver->domainEventState, event); @@ -6861,7 +6857,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) @@ -6976,7 +6972,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, ret =3D 0; =20 cleanup: - virObjectUnref(cookie); virCommandFree(cmd); VIR_FREE(errbuf); if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) @@ -13533,9 +13528,8 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, const char *xmlCPU, unsigned int flags) { - int ret =3D VIR_CPU_COMPARE_ERROR; virQEMUDriverPtr driver =3D conn->privateData; - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; bool failIncompatible; virCPUDefPtr hvCPU; virArch arch; @@ -13545,7 +13539,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, VIR_CPU_COMPARE_ERROR); =20 if (virConnectCompareHypervisorCPUEnsureACL(conn) < 0) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 failIncompatible =3D !!(flags & VIR_CONNECT_COMPARE_CPU_FAIL_INCOMPATI= BLE); =20 @@ -13556,7 +13550,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, machine, &arch, &virttype, NULL); if (!qemuCaps) - goto cleanup; + return VIR_CPU_COMPARE_ERROR; =20 hvCPU =3D virQEMUCapsGetHostModel(qemuCaps, virttype, VIR_QEMU_CAPS_HOST_CPU_REPORTED); @@ -13567,20 +13561,18 @@ qemuConnectCompareHypervisorCPU(virConnectPtr con= n, "virttype '%s'"), virQEMUCapsGetBinary(qemuCaps), virDomainVirtTypeToString(virttype)); - goto cleanup; + return VIR_CPU_COMPARE_ERROR; } =20 if (ARCH_IS_X86(arch)) { - ret =3D virCPUCompareXML(arch, hvCPU, xmlCPU, failIncompatible); + return virCPUCompareXML(arch, hvCPU, xmlCPU, failIncompatible); } else { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("comparing with the hypervisor CPU is not support= ed " "for arch %s"), virArchToString(arch)); } =20 - cleanup: - virObjectUnref(qemuCaps); - return ret; + return VIR_CPU_COMPARE_ERROR; } =20 =20 @@ -13643,7 +13635,7 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, { virQEMUDriverPtr driver =3D conn->privateData; virCPUDefPtr *cpus =3D NULL; - virQEMUCapsPtr qemuCaps =3D NULL; + VIR_AUTOUNREF(virQEMUCapsPtr) qemuCaps =3D NULL; virArch arch; virDomainVirtType virttype; virDomainCapsCPUModelsPtr cpuModels; @@ -13714,7 +13706,6 @@ qemuConnectBaselineHypervisorCPU(virConnectPtr conn, cleanup: virCPUDefListFree(cpus); virCPUDefFree(cpu); - virObjectUnref(qemuCaps); virStringListFree(features); =20 return cpustr; @@ -17541,7 +17532,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; @@ -17642,7 +17633,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); =20 cleanup: - virObjectUnref(job); virDomainObjEndAPI(&vm); return ret; } @@ -20312,17 +20302,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, @@ -20331,18 +20320,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 @@ -21585,7 +21570,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; @@ -21653,7 +21638,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]); @@ -22448,32 +22432,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