From nobody Tue Feb 10 15:01:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1632719303; cv=none; d=zohomail.com; s=zohoarc; b=MepeZqg2KZAOzyzfJWeRX3vzv16CY+f1PX6TyjKlSzavGbBfvablAC9AJ8e5eZFpGlopKcB95IGmijUIw5xDH3LP+KPj3CmQNrBBKVzwlZG+5eipKL4w9XKislSfqIrJXhVhWjcCA4PQRRktSeq3yzxyhpzxcyYyyIb+DFTm8rA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632719303; 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=lYFbyKbsr05V7e9TvahObqvCm59gO/wjjsiez54//68=; b=ZsPm2CUu6O3PcwZlz40KBg+Xf+boU5YpWOjj4FGJdKECdE+F8rIs0HtGKi7Sz9+ZJ7FO2yfvjBXBfJg9lGhcWB4h3x70gX7yXKE3FJ4ZYFkflbxfYqjV155LoBvDNoK2s7+xIlPqNCk56394+PieFjOHieRD2FDPPsJR3KS80lw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1632719303985376.29889803260835; Sun, 26 Sep 2021 22:08:23 -0700 (PDT) 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-478-qwzjX3Q4NKiAz0RxODA97g-1; Mon, 27 Sep 2021 01:08:20 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89EDE101F00E; Mon, 27 Sep 2021 05:08:14 +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 6608A1017CE4; Mon, 27 Sep 2021 05:08:14 +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 299E94E58F; Mon, 27 Sep 2021 05:08:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18R583U1004215 for ; Mon, 27 Sep 2021 01:08:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9BCB0189C4; Mon, 27 Sep 2021 05:08:03 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EB9D179B3 for ; Mon, 27 Sep 2021 05:08:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632719302; 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=lYFbyKbsr05V7e9TvahObqvCm59gO/wjjsiez54//68=; b=dcKQMJob/9NQEXRNsI7rUEVGFpTFHMpF7N6No0gVFHnkee/9jB5w6dm0/kpVy8JRzdZkd1 RFlqUycLKm3wNWj/UnNSH9KApezfFJOhJs32WBy/bWVQa+kaI9p0skMKdRcawYp88Swqpr 6nTUlcM2Nkw2c6rU4Lvn0D3GUqvQ2PA= X-MC-Unique: qwzjX3Q4NKiAz0RxODA97g-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 5/8] virsh: Add wrapper for virNetworkFree Date: Mon, 27 Sep 2021 07:07:47 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.84 on 10.5.11.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632719304639100007 Content-Type: text/plain; charset="utf-8" Similarly to virshDomainFree add a wrapper for the snapshot object freeing function. Signed-off-by: Michal Privoznik --- build-aux/syntax-check.mk | 2 +- tools/virsh-completer-network.c | 8 ++-- tools/virsh-network.c | 75 ++++++++++----------------------- tools/virsh-util.c | 11 +++++ tools/virsh-util.h | 5 +++ 5 files changed, 43 insertions(+), 58 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 2bdbd14c80..0c0d844d6c 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -868,7 +868,7 @@ sc_gettext_init: $(_sc_search_regexp) =20 sc_prohibit_obj_free_apis_in_virsh: - @prohibit=3D'\bvir(Domain|DomainSnapshot|Interface|Secret|StoragePool|Sto= rageVol)Free\b' \ + @prohibit=3D'\bvir(Domain|DomainSnapshot|Interface|Network|Secret|Storage= Pool|StorageVol)Free\b' \ in_vc_files=3D'virsh.*\.[ch]$$' \ exclude=3D'sc_prohibit_obj_free_apis_in_virsh' \ halt=3D'avoid using public virXXXFree in virsh, use virsh-prefixed wrappe= rs instead' \ diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-networ= k.c index f9154f23a4..d498f59cb8 100644 --- a/tools/virsh-completer-network.c +++ b/tools/virsh-completer-network.c @@ -21,6 +21,7 @@ #include =20 #include "virsh-completer-network.h" +#include "virsh-util.h" #include "viralloc.h" #include "virsh-network.h" #include "virsh.h" @@ -60,7 +61,7 @@ virshNetworkNameCompleter(vshControl *ctl, ret =3D g_steal_pointer(&tmp); =20 for (i =3D 0; i < nnets; i++) - virNetworkFree(nets[i]); + virshNetworkFree(nets[i]); g_free(nets); return ret; } @@ -170,7 +171,7 @@ virshNetworkUUIDCompleter(vshControl *ctl, =20 cleanup: for (i =3D 0; i < nnets; i++) - virNetworkFree(nets[i]); + virshNetworkFree(nets[i]); g_free(nets); return ret; } @@ -183,7 +184,7 @@ virshNetworkDhcpMacCompleter(vshControl *ctl, { virshControl *priv =3D ctl->privData; virNetworkDHCPLeasePtr *leases =3D NULL; - virNetworkPtr network =3D NULL; + g_autoptr(virshNetwork) network =3D NULL; int nleases; size_t i =3D 0; char **ret =3D NULL; @@ -215,6 +216,5 @@ virshNetworkDhcpMacCompleter(vshControl *ctl, virNetworkDHCPLeaseFree(leases[i]); VIR_FREE(leases); } - virNetworkFree(network); return ret; } diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 1442210278..02b22bf912 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -20,6 +20,7 @@ =20 #include #include "virsh-network.h" +#include "virsh-util.h" =20 #include "internal.h" #include "viralloc.h" @@ -155,7 +156,7 @@ static const vshCmdOptDef opts_network_autostart[] =3D { static bool cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; const char *name; int autostart; =20 @@ -169,7 +170,6 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("failed to mark network %s as autostarted"), n= ame); else vshError(ctl, _("failed to unmark network %s as autostarted"),= name); - virNetworkFree(network); return false; } =20 @@ -178,7 +178,6 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) else vshPrintExtra(ctl, _("Network %s unmarked as autostarted\n"), name= ); =20 - virNetworkFree(network); return true; } =20 @@ -207,7 +206,7 @@ static const vshCmdOptDef opts_network_create[] =3D { static bool cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; const char *from =3D NULL; g_autofree char *buffer =3D NULL; unsigned int flags =3D 0; @@ -234,7 +233,6 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) =20 vshPrintExtra(ctl, _("Network %s created from %s\n"), virNetworkGetName(network), from); - virNetworkFree(network); return true; } =20 @@ -264,7 +262,7 @@ static const vshCmdOptDef opts_network_define[] =3D { static bool cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; const char *from =3D NULL; g_autofree char *buffer =3D NULL; unsigned int flags =3D 0; @@ -291,7 +289,6 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) =20 vshPrintExtra(ctl, _("Network %s defined from %s\n"), virNetworkGetName(network), from); - virNetworkFree(network); return true; } =20 @@ -316,7 +313,7 @@ static const vshCmdOptDef opts_network_destroy[] =3D { static bool cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; bool ret =3D true; const char *name; =20 @@ -330,7 +327,6 @@ cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd) ret =3D false; } =20 - virNetworkFree(network); return ret; } =20 @@ -359,7 +355,7 @@ static const vshCmdOptDef opts_network_dumpxml[] =3D { static bool cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; g_autofree char *dump =3D NULL; unsigned int flags =3D 0; =20 @@ -370,12 +366,10 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) flags |=3D VIR_NETWORK_XML_INACTIVE; =20 if (!(dump =3D virNetworkGetXMLDesc(network, flags))) { - virNetworkFree(network); return false; } =20 vshPrint(ctl, "%s", dump); - virNetworkFree(network); return true; } =20 @@ -400,7 +394,7 @@ static const vshCmdOptDef opts_network_info[] =3D { static bool cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN]; int autostart; int persistent =3D -1; @@ -435,7 +429,6 @@ cmdNetworkInfo(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%-15s %s\n", _("Bridge:"), bridge); =20 VIR_FREE(bridge); - virNetworkFree(network); return true; } =20 @@ -467,8 +460,7 @@ virshNetworkListFree(struct virshNetworkList *list) =20 if (list && list->nets) { for (i =3D 0; i < list->nnets; i++) { - if (list->nets[i]) - virNetworkFree(list->nets[i]); + virshNetworkFree(list->nets[i]); } g_free(list->nets); } @@ -626,8 +618,7 @@ virshNetworkListCollect(vshControl *ctl, =20 remove_entry: /* the pool has to be removed as it failed one of the filters */ - virNetworkFree(list->nets[i]); - list->nets[i] =3D NULL; + g_clear_pointer(&list->nets[i], virshNetworkFree); deleted++; } =20 @@ -825,14 +816,13 @@ static const vshCmdOptDef opts_network_name[] =3D { static bool cmdNetworkName(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; =20 if (!(network =3D virshCommandOptNetworkBy(ctl, cmd, NULL, VIRSH_BYUUID))) return false; =20 vshPrint(ctl, "%s\n", virNetworkGetName(network)); - virNetworkFree(network); return true; } =20 @@ -857,7 +847,7 @@ static const vshCmdOptDef opts_network_start[] =3D { static bool cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; bool ret =3D true; const char *name =3D NULL; =20 @@ -870,7 +860,6 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("Failed to start network %s"), name); ret =3D false; } - virNetworkFree(network); return ret; } =20 @@ -895,7 +884,7 @@ static const vshCmdOptDef opts_network_undefine[] =3D { static bool cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; bool ret =3D true; const char *name; =20 @@ -909,7 +898,6 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) ret =3D false; } =20 - virNetworkFree(network); return ret; } =20 @@ -972,7 +960,7 @@ static bool cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) { bool ret =3D false; - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; const char *commandStr =3D NULL; const char *sectionStr =3D NULL; int command, section, parentIndex =3D -1; @@ -1071,7 +1059,6 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) ret =3D true; cleanup: vshReportError(ctl); - virNetworkFree(network); return ret; } =20 @@ -1096,7 +1083,7 @@ static const vshCmdOptDef opts_network_uuid[] =3D { static bool cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN]; =20 if (!(network =3D virshCommandOptNetworkBy(ctl, cmd, NULL, @@ -1108,7 +1095,6 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) else vshError(ctl, "%s", _("failed to get network UUID")); =20 - virNetworkFree(network); return true; } =20 @@ -1150,8 +1136,8 @@ static bool cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd) { bool ret =3D false; - virNetworkPtr network =3D NULL; - virNetworkPtr network_edited =3D NULL; + g_autoptr(virshNetwork) network =3D NULL; + g_autoptr(virshNetwork) network_edited =3D NULL; virshControl *priv =3D ctl->privData; =20 network =3D virshCommandOptNetwork(ctl, cmd, NULL); @@ -1176,11 +1162,6 @@ cmdNetworkEdit(vshControl *ctl, const vshCmd *cmd) ret =3D true; =20 cleanup: - if (network) - virNetworkFree(network); - if (network_edited) - virNetworkFree(network_edited); - return ret; } =20 @@ -1293,7 +1274,7 @@ static const vshCmdOptDef opts_network_event[] =3D { static bool cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr net =3D NULL; + g_autoptr(virshNetwork) net =3D NULL; bool ret =3D false; int eventId =3D -1; int timeout =3D 0; @@ -1362,8 +1343,6 @@ cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) if (eventId >=3D 0 && virConnectNetworkEventDeregisterAny(priv->conn, eventId) < 0) ret =3D false; - if (net) - virNetworkFree(net); return ret; } =20 @@ -1417,7 +1396,7 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *c= md) bool ret =3D false; size_t i; unsigned int flags =3D 0; - virNetworkPtr network =3D NULL; + g_autoptr(virshNetwork) network =3D NULL; g_autoptr(vshTable) table =3D NULL; =20 if (vshCommandOptStringReq(ctl, cmd, "mac", &mac) < 0) @@ -1477,7 +1456,6 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *c= md) virNetworkDHCPLeaseFree(leases[i]); VIR_FREE(leases); } - virNetworkFree(network); return ret; } =20 @@ -1511,7 +1489,7 @@ cmdNetworkPortCreate(vshControl *ctl, const vshCmd *c= md) const char *from =3D NULL; bool ret =3D false; char *buffer =3D NULL; - virNetworkPtr network =3D NULL; + g_autoptr(virshNetwork) network =3D NULL; unsigned int flags =3D 0; =20 network =3D virshCommandOptNetwork(ctl, cmd, NULL); @@ -1546,8 +1524,6 @@ cmdNetworkPortCreate(vshControl *ctl, const vshCmd *c= md) VIR_FREE(buffer); if (port) virNetworkPortFree(port); - if (network) - virNetworkFree(network); return ret; } =20 @@ -1573,7 +1549,7 @@ static const vshCmdOptDef opts_network_port_dumpxml[]= =3D { static bool cmdNetworkPortDumpXML(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network; + g_autoptr(virshNetwork) network =3D NULL; virNetworkPortPtr port =3D NULL; bool ret =3D true; g_autofree char *dump =3D NULL; @@ -1596,8 +1572,6 @@ cmdNetworkPortDumpXML(vshControl *ctl, const vshCmd *= cmd) cleanup: if (port) virNetworkPortFree(port); - if (network) - virNetworkFree(network); return ret; } =20 @@ -1624,7 +1598,7 @@ static const vshCmdOptDef opts_network_port_delete[] = =3D { static bool cmdNetworkPortDelete(vshControl *ctl, const vshCmd *cmd) { - virNetworkPtr network =3D NULL; + g_autoptr(virshNetwork) network =3D NULL; virNetworkPortPtr port =3D NULL; bool ret =3D true; char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -1649,8 +1623,6 @@ cmdNetworkPortDelete(vshControl *ctl, const vshCmd *c= md) cleanup: if (port) virNetworkPortFree(port); - if (network) - virNetworkFree(network); return ret; } =20 @@ -1703,7 +1675,7 @@ virshNetworkPortListCollect(vshControl *ctl, { struct virshNetworkPortList *list =3D g_new0(struct virshNetworkPortLi= st, 1); int ret; - virNetworkPtr network =3D NULL; + g_autoptr(virshNetwork) network =3D NULL; bool success =3D false; =20 if (!(network =3D virshCommandOptNetwork(ctl, cmd, NULL))) @@ -1729,9 +1701,6 @@ virshNetworkPortListCollect(vshControl *ctl, list =3D NULL; } =20 - if (network) - virNetworkFree(network); - return list; } =20 diff --git a/tools/virsh-util.c b/tools/virsh-util.c index c680c5b3d4..f7b649983e 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -296,6 +296,17 @@ virshInterfaceFree(virInterfacePtr iface) } =20 =20 +void +virshNetworkFree(virNetworkPtr network) +{ + if (!network) + return; + + vshSaveLibvirtHelperError(); + virNetworkFree(network); /* sc_prohibit_obj_free_apis_in_virsh */ +} + + void virshSecretFree(virSecretPtr secret) { diff --git a/tools/virsh-util.h b/tools/virsh-util.h index ce3462a865..e8df0a6618 100644 --- a/tools/virsh-util.h +++ b/tools/virsh-util.h @@ -59,6 +59,11 @@ void virshInterfaceFree(virInterfacePtr iface); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virshInterface, virshInterfaceFree); =20 +typedef virNetwork virshNetwork; +void +virshNetworkFree(virNetworkPtr network); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virshNetwork, virshNetworkFree); + typedef virSecret virshSecret; void virshSecretFree(virSecretPtr secret); --=20 2.32.0