From nobody Tue Feb 10 04:13:23 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=1661175187; cv=none; d=zohomail.com; s=zohoarc; b=MB9dlGFaJ4QoKzT7OvVKDZFuQZUnc9e3RQgSqkqY7Y5os2cIQFDcVPsE5jK/sRqNN4yIG/+t/MbmewiMaHjQHpSBPUKlGIB+h7hhLxqJ4xRfl2ub0x6zsv70qG5EyfSNoHph7PYTw+Xr5FMjB92hp+G6xx4WDQWAOOspq2FTFsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661175187; 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=M86kdqZrDLASji7foh8X4dR8PNvww1ddu27j0Reox78=; b=A7qeKtADclagnoT6bRCq6tpm3GKTZJcbk7HzSFc15RIsYYzjf8Xt86KBOpoPI9iNqpR2PB2KCHO2t8A4OQPlodZYLwDlGTt0ybjE8upyJ0PtipDLAps/dqzR6xpO5VMq2nuTDOeCL00YNZ4teIiOv56mr1XcuZO/IduTtgM4Ol4= 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 1661175187388951.0189192667452; Mon, 22 Aug 2022 06:33:07 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-630-3R5LVrotPcOZuFae3kyFWg-1; Mon, 22 Aug 2022 09:32:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B77A1802CE0; Mon, 22 Aug 2022 13:32:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26F4EC15BC0; Mon, 22 Aug 2022 13:32:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3D9351946A61; Mon, 22 Aug 2022 13:32:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5E48D1946A47 for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 52EF640CFD0B; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.2.16.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D99B40CFD0A for ; Mon, 22 Aug 2022 13:31:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661175185; 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=M86kdqZrDLASji7foh8X4dR8PNvww1ddu27j0Reox78=; b=R4DuKAnH0xC1pDzeAABeGhQk8b68gpiUh6RaHjQtICNGNzNMZxvv4C1n4LFGCyk/hIV4nC pIYUju6Znnt4+qmcM87esHhCa4tZt6vvWgEoLIC+RlUG6BpIHWgzekJxNFaLrXg2GGeQsA PwtjxKk+9igKJ/46wee7cxObTyvMCcQ= X-MC-Unique: 3R5LVrotPcOZuFae3kyFWg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 03/16] network: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef) Date: Mon, 22 Aug 2022 09:31:37 -0400 Message-Id: <20220822133150.1098794-4-laine@redhat.com> In-Reply-To: <20220822133150.1098794-1-laine@redhat.com> References: <20220822133150.1098794-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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: 1661175189473100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Laine Stump --- src/network/bridge_driver.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f6538d2638..733abaa719 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3051,7 +3051,7 @@ networkCreateXMLFlags(virConnectPtr conn, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); - virNetworkDef *newDef; + g_autoptr(virNetworkDef) newDef =3D NULL; virNetworkObj *obj =3D NULL; virNetworkDef *def; virNetworkPtr net =3D NULL; @@ -3077,6 +3077,7 @@ networkCreateXMLFlags(virConnectPtr conn, VIR_NETWORK_OBJ_LIST_ADD_LIVE | VIR_NETWORK_OBJ_LIST_ADD_CHECK_LIVE= ))) goto cleanup; + newDef =3D NULL; def =3D virNetworkObjGetDef(obj); =20 @@ -3094,7 +3095,6 @@ networkCreateXMLFlags(virConnectPtr conn, net =3D virGetNetwork(conn, def->name, def->uuid); =20 cleanup: - virNetworkDefFree(newDef); virObjectEventStateQueue(driver->networkEventState, event); virNetworkObjEndAPI(&obj); return net; @@ -3115,8 +3115,8 @@ networkDefineXMLFlags(virConnectPtr conn, unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); - virNetworkDef *def =3D NULL; - bool freeDef =3D true; + g_autoptr(virNetworkDef) def =3D NULL; + virNetworkDef *defAlias; virNetworkObj *obj =3D NULL; virNetworkPtr net =3D NULL; virObjectEvent *event =3D NULL; @@ -3127,6 +3127,8 @@ networkDefineXMLFlags(virConnectPtr conn, !!(flags & VIR_NETWORK_DEFINE_VAL= IDATE)))) goto cleanup; =20 + defAlias =3D def; /* so we can still ref the object after nullifying d= ef */ + if (virNetworkDefineXMLFlagsEnsureACL(conn, def) < 0) goto cleanup; =20 @@ -3136,11 +3138,11 @@ networkDefineXMLFlags(virConnectPtr conn, if (!(obj =3D virNetworkObjAssignDef(driver->networks, def, 0))) goto cleanup; =20 - /* def was assigned to network object */ - freeDef =3D false; + /* def was assigned to network object so don't autofree */ + def =3D NULL; =20 if (virNetworkSaveConfig(driver->networkConfigDir, - def, network_driver->xmlopt) < 0) { + defAlias, network_driver->xmlopt) < 0) { if (!virNetworkObjIsActive(obj)) { virNetworkObjRemoveInactive(driver->networks, obj); goto cleanup; @@ -3153,17 +3155,15 @@ networkDefineXMLFlags(virConnectPtr conn, goto cleanup; } =20 - event =3D virNetworkEventLifecycleNew(def->name, def->uuid, + event =3D virNetworkEventLifecycleNew(defAlias->name, defAlias->uuid, VIR_NETWORK_EVENT_DEFINED, 0); =20 - VIR_INFO("Defining network '%s'", def->name); - net =3D virGetNetwork(conn, def->name, def->uuid); + VIR_INFO("Defining network '%s'", defAlias->name); + net =3D virGetNetwork(conn, defAlias->name, defAlias->uuid); =20 cleanup: virObjectEventStateQueue(driver->networkEventState, event); - if (freeDef) - virNetworkDefFree(def); virNetworkObjEndAPI(&obj); return net; } --=20 2.37.1