From nobody Mon Feb 9 08:28:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1639152463; cv=none; d=zohomail.com; s=zohoarc; b=CBPXrnBVhHQbTQWLZgcW6X7fuGVx9jOCPuhpT+S9Y/RxEqeQXQ7j/aNXv4ChndvpEj7mXue9e0THy6cavrNh35qbFZ6Y1kOAgOxZ3jf5poRZ6Dmlzv4JUIdmtqICzQEnKcgR1kNfZ7XrjKSFb3a73tgN0dETSQ9oxY2baTR754w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639152463; 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=df0V+KfMRLtboRjOCpO7/r3uJ2Ee2oxE6PQdUFOq+Sc=; b=T6vjVBLfGzgdvonpvDMkk1QHWVdAlLYq/od+AOmltwaC/qFapWepoLc9tgMaJb6jdLPgD9yxw2SxAvdZAycjGwxiTAtmaFI6GaMbVafBBWwUvpDLlDCG2LEyQu2bChQSPLDg23lIRCH1jnVgKrkiV5dEkoQ8VJnmo/EVbnjkbkU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1639152463365625.4874045887536; Fri, 10 Dec 2021 08:07:43 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-17-NjYP7aFIOna8l1elJ1X2aw-1; Fri, 10 Dec 2021 11:07:40 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8AB6E100F942; Fri, 10 Dec 2021 16:07:33 +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 D230360657; Fri, 10 Dec 2021 16:07:32 +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 7D6C04CA9B; Fri, 10 Dec 2021 16:07:32 +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 1BAG6LhX015227 for ; Fri, 10 Dec 2021 11:06:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id C74B660C4A; Fri, 10 Dec 2021 16:06:21 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EDB460BF4 for ; Fri, 10 Dec 2021 16:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639152462; 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=df0V+KfMRLtboRjOCpO7/r3uJ2Ee2oxE6PQdUFOq+Sc=; b=NhX0xeFRBa8IlUEFDbSMr+EY3XN8l2hY2yNxqE4ZLck5VJknS5HiuV8K5T1fZq84m9aR+a mnFwriE32rPxwhC2avRTKuQgyBFamVsIAXIumVI3hiERPWTkp+dUV+MMFwGF8S7vN4cuzc 3GO5Q7k+OIrH7r/MtTsJfQJ0fzNQnWU= X-MC-Unique: NjYP7aFIOna8l1elJ1X2aw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/8] Use g_auto for freeing virCaps Date: Fri, 10 Dec 2021 17:06:12 +0100 Message-Id: <162b336f33aff9fcbbb30a85333fb3d2aa133de7.1639152235.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 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.11 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) X-ZM-MESSAGEID: 1639152464940100001 Convert all the users who unref their virCaps object unconditionally. Signed-off-by: J=C3=A1n Tomko --- src/bhyve/bhyve_driver.c | 9 +++------ src/ch/ch_driver.c | 3 +-- src/lxc/lxc_driver.c | 21 +++++++-------------- src/lxc/lxc_process.c | 3 +-- 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 250e10b9d0..e445c8cadf 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -140,7 +140,7 @@ static char * bhyveConnectGetCapabilities(virConnectPtr conn) { struct _bhyveConn *privconn =3D conn->privateData; - virCaps *caps; + g_autoptr(virCaps) caps =3D NULL; char *xml =3D NULL; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) @@ -156,7 +156,6 @@ bhyveConnectGetCapabilities(virConnectPtr conn) goto cleanup; =20 cleanup: - virObjectUnref(caps); return xml; } =20 @@ -508,7 +507,7 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flag g_autoptr(virDomainDef) oldDef =3D NULL; virDomainObj *vm =3D NULL; virObjectEvent *event =3D NULL; - virCaps *caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL); @@ -554,7 +553,6 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flag dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - virObjectUnref(caps); virDomainObjEndAPI(&vm); virObjectEventStateQueue(privconn->domainEventState, event); =20 @@ -1434,7 +1432,7 @@ bhyveConnectCompareCPU(virConnectPtr conn, { struct _bhyveConn *driver =3D conn->privateData; int ret =3D VIR_CPU_COMPARE_ERROR; - virCaps *caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; bool failIncompatible; bool validateXML; =20 @@ -1466,7 +1464,6 @@ bhyveConnectCompareCPU(virConnectPtr conn, } =20 cleanup: - virObjectUnref(caps); return ret; } =20 diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 108644e503..06cfb1c5ef 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -187,7 +187,7 @@ static int chNodeGetInfo(virConnectPtr conn, static char *chConnectGetCapabilities(virConnectPtr conn) { virCHDriver *driver =3D conn->privateData; - virCaps *caps; + g_autoptr(virCaps) caps =3D NULL; char *xml; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) @@ -198,7 +198,6 @@ static char *chConnectGetCapabilities(virConnectPtr con= n) =20 xml =3D virCapabilitiesFormatXML(caps); =20 - virObjectUnref(caps); return xml; } =20 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index d86147cc28..92ae22ef2b 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -197,7 +197,7 @@ static int lxcConnectIsAlive(virConnectPtr conn G_GNUC_= UNUSED) =20 static char *lxcConnectGetCapabilities(virConnectPtr conn) { virLXCDriver *driver =3D conn->privateData; - virCaps *caps; + g_autoptr(virCaps) caps =3D NULL; char *xml; =20 if (virConnectGetCapabilitiesEnsureACL(conn) < 0) @@ -208,7 +208,6 @@ static char *lxcConnectGetCapabilities(virConnectPtr co= nn) { =20 xml =3D virCapabilitiesFormatXML(caps); =20 - virObjectUnref(caps); return xml; } =20 @@ -405,7 +404,7 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char = *xml, unsigned int flags) virObjectEvent *event =3D NULL; g_autoptr(virDomainDef) oldDef =3D NULL; virLXCDriverConfig *cfg =3D virLXCDriverGetConfig(driver); - virCaps *caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL); @@ -459,7 +458,6 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char = *xml, unsigned int flags) cleanup: virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); virObjectUnref(cfg); return dom; } @@ -937,7 +935,7 @@ static char *lxcConnectDomainXMLFromNative(virConnectPt= r conn, char *xml =3D NULL; g_autoptr(virDomainDef) def =3D NULL; virLXCDriver *driver =3D conn->privateData; - virCaps *caps =3D virLXCDriverGetCapabilities(driver, false); + g_autoptr(virCaps) caps =3D virLXCDriverGetCapabilities(driver, false); =20 virCheckFlags(0, NULL); =20 @@ -956,7 +954,6 @@ static char *lxcConnectDomainXMLFromNative(virConnectPt= r conn, xml =3D virDomainDefFormat(def, driver->xmlopt, 0); =20 cleanup: - virObjectUnref(caps); return xml; } =20 @@ -1082,7 +1079,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, virDomainPtr dom =3D NULL; virObjectEvent *event =3D NULL; virLXCDriverConfig *cfg =3D virLXCDriverGetConfig(driver); - virCaps *caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 virCheckFlags(VIR_DOMAIN_START_AUTODESTROY | @@ -1150,7 +1147,6 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, cleanup: virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); - virObjectUnref(caps); virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); return dom; @@ -1229,7 +1225,7 @@ static int lxcNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) { virLXCDriver *driver =3D conn->privateData; - virCaps *caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; int ret =3D 0; =20 memset(secmodel, 0, sizeof(*secmodel)); @@ -1268,7 +1264,6 @@ static int lxcNodeGetSecurityModel(virConnectPtr conn, } =20 cleanup: - virObjectUnref(caps); return ret; } =20 @@ -1807,7 +1802,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, unsigned int flags) { virLXCDriver *driver =3D dom->conn->privateData; - virCaps *caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; size_t i; virDomainObj *vm =3D NULL; virDomainDef *def =3D NULL; @@ -1925,7 +1920,6 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virObjectUnref(caps); virObjectUnref(cfg); return ret; } @@ -4456,7 +4450,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr do= m, unsigned int flags) { virLXCDriver *driver =3D dom->conn->privateData; - virCaps *caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; virDomainObj *vm =3D NULL; g_autoptr(virDomainDef) vmdef =3D NULL; virDomainDeviceDef *dev =3D NULL; @@ -4540,7 +4534,6 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr do= m, virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); - virObjectUnref(caps); virObjectUnref(cfg); return ret; } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index d262128a50..501f418557 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1207,7 +1207,7 @@ int virLXCProcessStart(virConnectPtr conn, int nsInheritFDs[VIR_LXC_DOMAIN_NAMESPACE_LAST]; virCommand *cmd =3D NULL; virLXCDomainObjPrivate *priv =3D vm->privateData; - virCaps *caps =3D NULL; + g_autoptr(virCaps) caps =3D NULL; virErrorPtr err =3D NULL; virLXCDriverConfig *cfg =3D virLXCDriverGetConfig(driver); g_autoptr(virCgroup) selfcgroup =3D NULL; @@ -1579,7 +1579,6 @@ int virLXCProcessStart(virConnectPtr conn, for (i =3D 0; i < G_N_ELEMENTS(handshakefds); i++) VIR_FORCE_CLOSE(handshakefds[i]); virObjectUnref(cfg); - virObjectUnref(caps); =20 virErrorRestore(&err); =20 --=20 2.31.1