From nobody Tue Feb 10 04:14:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1610120365; cv=none; d=zohomail.com; s=zohoarc; b=GqPqSj1xHOiDQ5hLzr/2NT1RBNLVzRsVXShAGlMKH8UN+fzZj2EV1YvRnmaX0yBXZgSDUkFjGqazidARRpVQxpjo1xs9JemNan8hbtB9M3RuxlGWgkCp+4Npt9pmTfY2bvT6srF3PSY+g81ABW6C0B9D4Gmd58uY1vL/IYXM8AM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610120365; 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=xaLNyUpp4/CceTVJH/qoCv4nOONPA6/D80qKFUaY6sE=; b=GHlHuXBdRFHYR8t7s5OqagSW7+SwPfHei3IPIPyxkV0lHXTCaDt6a9rc9wvcphdaW6Re+OvGTfYtaRiWe5s9NQil3EUDkCVl3eh2ikyhN3QhjrI8nFRsePhlxZxnj2AqXuS1F5JcDAAtoejW+s679tqgwNVMPqcJ3ho+mMVfsPY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1610120365281754.2016680715406; Fri, 8 Jan 2021 07:39:25 -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-330-iqTA2CKkMySkVo_GBszJqw-1; Fri, 08 Jan 2021 10:39:21 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CC50801B1D; Fri, 8 Jan 2021 15:39:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF6BF60D79; Fri, 8 Jan 2021 15:39:15 +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 A894D1809CA4; Fri, 8 Jan 2021 15:39:15 +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 108FcuGN013886 for ; Fri, 8 Jan 2021 10:38:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id 203FB18035; Fri, 8 Jan 2021 15:38:56 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-90.phx2.redhat.com [10.3.112.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCB015E1A7 for ; Fri, 8 Jan 2021 15:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610120364; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=xaLNyUpp4/CceTVJH/qoCv4nOONPA6/D80qKFUaY6sE=; b=Pj4zQCPSneAFO0++oCqCHPBiRkz6x1ga1JZxxLRv6O5T02moWUM+Gs1iZ1pqzarFXkSWRi RhJEwJAU7pYH4VkKiltNawJa51bkYX97JspXavtbClKEu9txa0glXXbg4+dKpEWuP/AZnx CXbQ9kkZgn2MPZDXnUsil16JD5Lt+00= X-MC-Unique: iqTA2CKkMySkVo_GBszJqw-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt Patch v2 3/4] use g_autoptr for all virConnectPtrs used with virGetConnectNetwork() Date: Fri, 8 Jan 2021 10:38:48 -0500 Message-Id: <20210108153849.105584-4-laine@redhat.com> In-Reply-To: <20210108153849.105584-1-laine@redhat.com> References: <20210108153849.105584-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik Signed-off-by: Laine Stump --- src/conf/domain_conf.c | 3 +-- src/libxl/libxl_domain.c | 7 +++---- src/libxl/libxl_driver.c | 15 +++++---------- src/lxc/lxc_driver.c | 17 +++++------------ src/lxc/lxc_process.c | 10 +++------- 5 files changed, 17 insertions(+), 35 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 40ca20be33..349fc28c2a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31040,7 +31040,7 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr ifac= e, virNetworkPortPtr port =3D NULL; virTypedParameterPtr params =3D NULL; int nparams =3D 0; - virConnectPtr conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; int ret =3D -1; =20 if (!(conn =3D virGetConnectNetwork())) @@ -31060,7 +31060,6 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr ifac= e, =20 ret =3D 0; cleanup: - virObjectUnref(conn); virTypedParamsFree(params, nparams); virObjectUnref(port); virObjectUnref(net); diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ab838b317c..c046fcb3f7 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -25,6 +25,7 @@ #include "libxl_domain.h" #include "libxl_capabilities.h" =20 +#include "datatypes.h" #include "viralloc.h" #include "virfile.h" #include "virerror.h" @@ -849,7 +850,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, char *file; virHostdevManagerPtr hostdev_mgr =3D driver->hostdevMgr; unsigned int hostdev_flags =3D VIR_HOSTDEV_SP_PCI; - virConnectPtr conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; =20 #ifdef LIBXL_HAVE_PVUSB hostdev_flags |=3D VIR_HOSTDEV_SP_USB; @@ -936,7 +937,6 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } =20 virDomainObjRemoveTransientDef(vm); - virObjectUnref(conn); } =20 /* @@ -1050,7 +1050,7 @@ static int libxlNetworkPrepareDevices(virDomainDefPtr def) { size_t i; - virConnectPtr conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; int ret =3D -1; =20 for (i =3D 0; i < def->nnets; i++) { @@ -1096,7 +1096,6 @@ libxlNetworkPrepareDevices(virDomainDefPtr def) =20 ret =3D 0; cleanup: - virObjectUnref(conn); return ret; } =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 40d8c3d174..5bd3614e21 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -355,7 +355,7 @@ static void libxlReconnectNotifyNets(virDomainDefPtr def) { size_t i; - virConnectPtr conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -372,8 +372,6 @@ libxlReconnectNotifyNets(virDomainDefPtr def) =20 virDomainNetNotifyActualDevice(conn, def, net); } - - virObjectUnref(conn); } =20 =20 @@ -3403,7 +3401,7 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driv= er, libxl_device_nic nic; int ret =3D -1; char mac[VIR_MAC_STRING_BUFLEN]; - virConnectPtr conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; virErrorPtr save_err =3D NULL; =20 libxl_device_nic_init(&nic); @@ -3478,7 +3476,6 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driv= er, if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK && conn) virDomainNetReleaseActualDevice(conn, vm->def, net); } - virObjectUnref(conn); virObjectUnref(cfg); virErrorRestore(&save_err); return ret; @@ -3904,13 +3901,11 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr dr= iver, libxl_device_nic_dispose(&nic); if (!ret) { if (detach->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { - virConnectPtr conn =3D virGetConnectNetwork(); - if (conn) { + g_autoptr(virConnect) conn =3D virGetConnectNetwork(); + if (conn) virDomainNetReleaseActualDevice(conn, vm->def, detach); - virObjectUnref(conn); - } else { + else VIR_WARN("Unable to release network device '%s'", NULLSTR(= detach->ifname)); - } } virDomainNetRemove(vm->def, detachidx); } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 88d3890de7..4416acf923 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3463,14 +3463,9 @@ lxcDomainAttachDeviceNetLive(virLXCDriverPtr driver, * to the one defined in the network definition. */ if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { - virConnectPtr netconn =3D virGetConnectNetwork(); - if (!netconn) + g_autoptr(virConnect) netconn =3D virGetConnectNetwork(); + if (!netconn || virDomainNetAllocateActualDevice(netconn, vm->def,= net) < 0) return -1; - if (virDomainNetAllocateActualDevice(netconn, vm->def, net) < 0) { - virObjectUnref(netconn); - return -1; - } - virObjectUnref(netconn); } =20 /* final validation now that actual type is known */ @@ -4028,13 +4023,11 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, if (!ret) { virErrorPreserveLast(&save_err); if (detach->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) { - virConnectPtr conn =3D virGetConnectNetwork(); - if (conn) { + g_autoptr(virConnect) conn =3D virGetConnectNetwork(); + if (conn) virDomainNetReleaseActualDevice(conn, vm->def, detach); - virObjectUnref(conn); - } else { + else VIR_WARN("Unable to release network device '%s'", NULLSTR(= detach->ifname)); - } } virDomainNetRemove(vm->def, detachidx); virDomainNetDefFree(detach); diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 0b6895bbd4..cbc04a3dcd 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -172,7 +172,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virLXCDomainObjPrivatePtr priv =3D vm->privateData; const virNetDevVPortProfile *vport =3D NULL; virLXCDriverConfigPtr cfg =3D virLXCDriverGetConfig(driver); - virConnectPtr conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; =20 VIR_DEBUG("Cleanup VM name=3D%s pid=3D%d reason=3D%d flags=3D0x%x", vm->def->name, (int)vm->pid, (int)reason, flags); @@ -281,7 +281,6 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virDomainObjRemoveTransientDef(vm); =20 virObjectUnref(cfg); - virObjectUnref(conn); } =20 =20 @@ -571,7 +570,7 @@ virLXCProcessSetupInterfaces(virLXCDriverPtr driver, size_t niface =3D 0; virDomainNetDefPtr net; virDomainNetType type; - virConnectPtr netconn =3D NULL; + g_autoptr(virConnect) netconn =3D NULL; virErrorPtr save_err =3D NULL; =20 *veths =3D g_new0(char *, def->nnets + 1); @@ -680,7 +679,6 @@ virLXCProcessSetupInterfaces(virLXCDriverPtr driver, } virErrorRestore(&save_err); } - virObjectUnref(netconn); return ret; } =20 @@ -1634,7 +1632,7 @@ static void virLXCProcessReconnectNotifyNets(virDomainDefPtr def) { size_t i; - virConnectPtr conn =3D NULL; + g_autoptr(virConnect) conn =3D NULL; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -1668,8 +1666,6 @@ virLXCProcessReconnectNotifyNets(virDomainDefPtr def) =20 virDomainNetNotifyActualDevice(conn, def, net); } - - virObjectUnref(conn); } =20 =20 --=20 2.29.2