From nobody Sun Feb 8 18:44:06 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=1660050925; cv=none; d=zohomail.com; s=zohoarc; b=oFStTh05vzEnKKV64obY/BvXYkejOyUdsR3dU0Fcs1jx1sJNqvX3Sna/1+nFxLIRK6bkCIwajD73b0KlaIdwQcqo2hMqmk9+VgM2mbpJQzg0+/1frNYBU4Seh5CNIFKyeVMnlKDvbRaU/+FkjbLsoQ2LLJ/PjgWAPdkIl2oCz/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660050925; 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=oH8zXvqwjGeQSBR8uRzgsNlwZwI1IUMCgLW6jYUm01Y=; b=irRXzD0HOn/NrBvbf0Re0dhWD5gTcBsTm99wsrXQRAI2+QE3BJEuy0wj9OWutQKsVDeK+Y5laWYr3FxtI3nHqxXivxJL0wvBVdAeW8uJ9Q44rfW7LEnKpCI751qoR46vJCaWUW4/SCz9uWB3NJ3n/K4DBPoCDQqrNaMnhCapctc= 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 1660050925648646.670198196296; Tue, 9 Aug 2022 06:15:25 -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-318-olS25E-FN3ik9usZad7pug-1; Tue, 09 Aug 2022 09:14:09 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC1A41035340; Tue, 9 Aug 2022 13:14:01 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9616B2166B26; Tue, 9 Aug 2022 13:14:01 +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 3E3141946A4C; Tue, 9 Aug 2022 13:14: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 33A8D194F847 for ; Tue, 9 Aug 2022 13:14:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 25638402494D; Tue, 9 Aug 2022 13:14:00 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id C544140CF8EB for ; Tue, 9 Aug 2022 13:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660050923; 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=oH8zXvqwjGeQSBR8uRzgsNlwZwI1IUMCgLW6jYUm01Y=; b=SwaPAs7GoYdgxoroRUpk3yJmBwZPwkGvB6hXENaZyupr12wGOt82ugc6c6bhhqX6gqbrVr t0emF6rtTX+ey6mxVUZy8cUBXvoUiNqcWODyTdr1NFXlN3kEuU8+Cf12s3tKEEn0Xtt+rR TlJOKr6e/Bhwo2gRgIsLs1qVlC53yWs= X-MC-Unique: olS25E-FN3ik9usZad7pug-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/5] virNetworkObjSetMacMap: take double pointer of @macmap Date: Tue, 9 Aug 2022 15:13:55 +0200 Message-Id: <0336092dc8c26e8baadf81a8ef8d2c59e1c2de0d.1660050814.git.mprivozn@redhat.com> In-Reply-To: References: 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.78 on 10.11.54.6 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: 1660050925929100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The virNetworkObjSetMacMap() API effectively steals passed @macmap argument. However, the argument is a plain, first order pointer. This requires every caller to set the argument to NULL after the function was called. Let's make the function take double pointer instead to make it obvious that the argument is consumed. Signed-off-by: Michal Privoznik --- src/conf/virnetworkobj.c | 4 ++-- src/conf/virnetworkobj.h | 2 +- src/network/bridge_driver.c | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 46b499db58..cc3b93db6d 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -240,9 +240,9 @@ virNetworkObjSetFloorSum(virNetworkObj *obj, =20 void virNetworkObjSetMacMap(virNetworkObj *obj, - virMacMap *macmap) + virMacMap **macmap) { - obj->macmap =3D macmap; + obj->macmap =3D g_steal_pointer(macmap); } =20 =20 diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index fadd277cbd..7d34fa3204 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -78,7 +78,7 @@ virNetworkObjSetFloorSum(virNetworkObj *obj, =20 void virNetworkObjSetMacMap(virNetworkObj *obj, - virMacMap *macmap); + virMacMap **macmap); =20 void virNetworkObjUnrefMacMap(virNetworkObj *obj); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a07af55390..024487b359 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -475,8 +475,7 @@ networkUpdateState(virNetworkObj *obj, if (!(macmap =3D virMacMapNew(macMapFile))) return -1; =20 - virNetworkObjSetMacMap(obj, macmap); - macmap =3D NULL; + virNetworkObjSetMacMap(obj, &macmap); =20 break; =20 @@ -1972,8 +1971,7 @@ networkStartNetworkVirtual(virNetworkDriverState *dri= ver, !(macmap =3D virMacMapNew(macMapFile))) goto error; =20 - virNetworkObjSetMacMap(obj, macmap); - macmap =3D NULL; + virNetworkObjSetMacMap(obj, &macmap); =20 /* Set bridge options */ =20 --=20 2.35.1