From nobody Sun May 5 20:01:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636623048; cv=none; d=zohomail.com; s=zohoarc; b=cf7lo+3ew39lDfchvZhgTecJ20IhaGDmVlcjBRX38/2jwZfIett2f2Vm8k1dkFXQ6ElIyXTDb/70kvT3IjYuVE6JctDHHIqQfQeFwijJJ7NtHxmoyyDoINun9MB7QpdLUrbgZNJjjaelaIkJUms9bhczRadyQWWhkeOaJVLICjI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636623048; 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=LwTCw4lxGI5gJGR9oLH9v8le59zukawqZJyln234uH0=; b=isCuiArk9Hyr2p3lhgQAcEmsKFB8ehO9UyqU073wYjL5gOrRu0qz6UJv4GLjTG3BumZ2ixG8TZnlebx4YAutyOsvZqK60Nc2PFvZ2PixPRGWHp8Y0LEYVrPtntZJIPe21bA/Ma2NYHVEYSJ+4Kqlgdk/jj8hcWgvCAKDjsjbn3g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636623048428766.9863486022772; Thu, 11 Nov 2021 01:30:48 -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-495-FKMzH2f6MFWEVM8NxwrL1g-1; Thu, 11 Nov 2021 04:30:45 -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 B99611006AA2; Thu, 11 Nov 2021 09:30:40 +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 9A8B160854; Thu, 11 Nov 2021 09:30:40 +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 678944EA37; Thu, 11 Nov 2021 09:30:40 +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 1AB9SSTG029366 for ; Thu, 11 Nov 2021 04:28:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 15DEA67841; Thu, 11 Nov 2021 09:28:28 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8377167847 for ; Thu, 11 Nov 2021 09:28:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636623047; 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=LwTCw4lxGI5gJGR9oLH9v8le59zukawqZJyln234uH0=; b=WPAWq8raQwTpRRQZS5zyzaJOLyMf+z6HBVgp2L6d0F9S9eBR7P1ivRK6diav6xmmr1s97D XH18J0pGSkguPB4zs/1RI6Il5b81xUReCmZ82laRI//FjENPMeOvPX1Edd46pfcdJU76DM hEnun8drGchgCnitYfErJwO6DmRc2Vo= X-MC-Unique: FKMzH2f6MFWEVM8NxwrL1g-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/5] Use virDomainObjEndAPI() more Date: Thu, 11 Nov 2021 10:28:17 +0100 Message-Id: <1bf7e7f7da934f79fbc367bd59f89c0a65bea0ad.1636622879.git.mprivozn@redhat.com> 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.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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1636623050527100001 Content-Type: text/plain; charset="utf-8" Instead of explicit virObjectUnlock(obj) + virObjectUnref(obj) combo the virDomainObjEndAPI() can be used. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/virdomainobjlist.c | 24 +++++++----------------- src/libxl/libxl_driver.c | 3 +-- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 5c40d697dc..ff6c4c1b4f 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -119,11 +119,8 @@ virDomainObjListFindByID(virDomainObjList *doms, virObjectRWUnlock(doms); if (obj) { virObjectLock(obj); - if (obj->removing) { - virObjectUnlock(obj); - virObjectUnref(obj); - obj =3D NULL; - } + if (obj->removing) + virDomainObjEndAPI(&obj); } =20 return obj; @@ -165,11 +162,8 @@ virDomainObjListFindByUUID(virDomainObjList *doms, obj =3D virDomainObjListFindByUUIDLocked(doms, uuid); virObjectRWUnlock(doms); =20 - if (obj && obj->removing) { - virObjectUnlock(obj); - virObjectUnref(obj); - obj =3D NULL; - } + if (obj && obj->removing) + virDomainObjEndAPI(&obj); =20 return obj; } @@ -208,11 +202,8 @@ virDomainObjListFindByName(virDomainObjList *doms, obj =3D virDomainObjListFindByNameLocked(doms, name); virObjectRWUnlock(doms); =20 - if (obj && obj->removing) { - virObjectUnlock(obj); - virObjectUnref(obj); - obj =3D NULL; - } + if (obj && obj->removing) + virDomainObjEndAPI(&obj); =20 return obj; } @@ -953,8 +944,7 @@ virDomainObjListFilter(virDomainObj ***list, if (vm->removing || (filter && !filter(conn, vm->def)) || !virDomainObjMatchFilter(vm, flags)) { - virObjectUnlock(vm); - virObjectUnref(vm); + virDomainObjEndAPI(&vm); VIR_DELETE_ELEMENT(*list, i, *nvms); continue; } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 3f67cda9e9..39da10983e 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -461,8 +461,7 @@ libxlReconnectDomain(virDomainObj *vm, =20 cleanup: libxl_dominfo_dispose(&d_info); - virObjectUnlock(vm); - virObjectUnref(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; =20 --=20 2.32.0 From nobody Sun May 5 20:01:47 2024 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=1636623006; cv=none; d=zohomail.com; s=zohoarc; b=feWrozvuLsSFK+sHWaLoqR2zOTS47pYwMpUXMEmrQNGX/b01246e33SLkOu+h8tnC6uqDmMk0RonY5K/Y4oYRSk03vWgWsPxubPzQdebIcNju7Rj84hAki6Tv8BA9JqURyksDcp7KVeJK+dMvoPxiw7Z8SfbXUwRl6d3k+ENRdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636623006; 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=xqOv0zznHGkdaN2Z9fgK1RZo+V0rT36KeinvGPKMwKE=; b=WtZP1VyBFXnmUmyT1Igp0MrBbwYTHzTeNPiTkxlO5WaHxJEkbMi4Iw0R4C3oPVK0b7UaO/rr7jPNlp2B+70qtoc/Dzud/Yjh1IFWTKO7Q3RXpGvJ2YVzEZ6P9cKQ/CnbFponzNSIkMsioeyoNDSzW+6Pv5A+TUn5Mwz2v2YOzv0= 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 1636623006629626.9296536227453; Thu, 11 Nov 2021 01:30:06 -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-197-Le-dOS1iNz6pGyiJTD1Ndg-1; Thu, 11 Nov 2021 04:30:02 -0500 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 DCC14804142; Thu, 11 Nov 2021 09:29:56 +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 AF4E110016F4; Thu, 11 Nov 2021 09:29:56 +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 7DAD74EA2A; Thu, 11 Nov 2021 09:29:56 +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 1AB9SS23029374 for ; Thu, 11 Nov 2021 04:28:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id E9E6067842; Thu, 11 Nov 2021 09:28:28 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67A5567841 for ; Thu, 11 Nov 2021 09:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636623005; 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=xqOv0zznHGkdaN2Z9fgK1RZo+V0rT36KeinvGPKMwKE=; b=A8uBpY7+PtOdCUHdFR6kxV9TE0wiiQhTk236pZ2eplrAbaQuWOp7o5y/dvIufYANvZaqTt 5kQRLmZaXyejPI7m6i3uVMsAQvJtbnfBUU1OZVmMs5RPxtmwZGoHQGUHGjjEVmsdRVzLfr gCny2VqZawLBqD32S5153RB3Fc1HCeg= X-MC-Unique: Le-dOS1iNz6pGyiJTD1Ndg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/5] Use virInterfaceObjEndAPI() more Date: Thu, 11 Nov 2021 10:28:18 +0100 Message-Id: <0c85d83ffaf2d8c78cebcb0c473e98f0604dabd3.1636622879.git.mprivozn@redhat.com> 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: 1636623008052100001 Content-Type: text/plain; charset="utf-8" Instead of explicit virObjectUnlock(obj) + virObjectUnref(obj) combo the virInterfaceObjEndAPI() can be used. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/virinterfaceobj.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index fa7a21c054..c5dfa6c7f5 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -462,8 +462,7 @@ virInterfaceObjListRemove(virInterfaceObjList *interfac= es, virObjectRWLockWrite(interfaces); virObjectLock(obj); virHashRemoveEntry(interfaces->objsName, obj->def->name); - virObjectUnlock(obj); - virObjectUnref(obj); + virInterfaceObjEndAPI(&obj); virObjectRWUnlock(interfaces); } =20 --=20 2.32.0 From nobody Sun May 5 20:01:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636623084; cv=none; d=zohomail.com; s=zohoarc; b=nfzfUV176co6Oe0uDiLlAuIEBQElQDuaYQ39SPlOnibqhdhOFf8ma6urGAKYoQy8ME9KBYRT8uvW5008tDaG7ySPrmJKRMLiiqw3DvXjLmJkHSSC7mSD9N8NSe3beT92NXk8b/tBVRpudQe+Y93+8NoUirzaYhQsh+ilJSz9XQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636623084; 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=HVEW+kgBgv9L6iYvcaHSRb3bnhLRuS6KLdzsAZkUk0w=; b=XTvu0HsSEHhS7LXmkutvI2ZZ7cmFLQLeidD+okWUzl6oSuroWhfQ/r0Kr95BKNPe1qgdwQ/Bg2WUN3tt0t+JII+8Fz2ITkpWpeqR8zDAsZBMAYAaU/zaW6rfz4q22W0Ddir1MyABMvlX7ANoevmBKs3AjrQ/92SwfaEdnRBpHzg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636623084779115.78245302186963; Thu, 11 Nov 2021 01:31:24 -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-403-Hz739l7MMpmiso5gpJAyhA-1; Thu, 11 Nov 2021 04:31:22 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D7352804140; Thu, 11 Nov 2021 09:31:16 +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 B8A895C1B4; Thu, 11 Nov 2021 09:31:16 +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 7AE4F4EA3B; Thu, 11 Nov 2021 09:31:16 +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 1AB9ST11029384 for ; Thu, 11 Nov 2021 04:28:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id CADB467841; Thu, 11 Nov 2021 09:28:29 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5123567847 for ; Thu, 11 Nov 2021 09:28:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636623083; 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=HVEW+kgBgv9L6iYvcaHSRb3bnhLRuS6KLdzsAZkUk0w=; b=XPfQEwqhO5Zoc8gmH69peUPoA40yiWkPp+BBeZSPh383uza3hjSA7y6+HazxjbVVOMUe7w QQKNRkXyCSIu3wTyuh4bhunqDuT5MJVeuJaHXbI/L3qoxeIF31w+UA61jXYjxcbS293vqK ZUoOxT+T0y1USta5yt50cpLItb39u7E= X-MC-Unique: Hz739l7MMpmiso5gpJAyhA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/5] Use virNWFilterBindingObjEndAPI() more Date: Thu, 11 Nov 2021 10:28:19 +0100 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.79 on 10.5.11.16 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: 1636623086255100001 Content-Type: text/plain; charset="utf-8" Instead of explicit virObjectUnlock(obj) + virObjectUnref(obj) combo the virNWFilterBindingObjEndAPI() can be used. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/virnwfilterbindingobjlist.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbin= dingobjlist.c index 470a30ca90..212cca2265 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -114,11 +114,8 @@ virNWFilterBindingObjListFindByPortDev(virNWFilterBind= ingObjList *bindings, obj =3D virNWFilterBindingObjListFindByPortDevLocked(bindings, name); virObjectRWUnlock(bindings); =20 - if (obj && virNWFilterBindingObjGetRemoving(obj)) { - virObjectUnlock(obj); - virObjectUnref(obj); - obj =3D NULL; - } + if (obj && virNWFilterBindingObjGetRemoving(obj)) + virNWFilterBindingObjEndAPI(&obj); =20 return obj; } @@ -407,8 +404,7 @@ virNWFilterBindingObjListFilter(virNWFilterBindingObj *= **list, */ if (virNWFilterBindingObjGetRemoving(binding) || (filter && !filter(conn, def))) { - virObjectUnlock(binding); - virObjectUnref(binding); + virNWFilterBindingObjEndAPI(&binding); VIR_DELETE_ELEMENT(*list, i, *nbindings); continue; } --=20 2.32.0 From nobody Sun May 5 20:01:47 2024 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=1636623063; cv=none; d=zohomail.com; s=zohoarc; b=jpJNintVl7WNupW1bQGmbpKqHa/JyMioLKTtfk+D5r504X/rABHfyuOuI/vdScRrjq8P85Sq1ieq6HGDTHSJPgTBucF45T1PmGfTl19OfTXFANNeIR4eoghoNK/Ulcbm/jSDUFriwBEcG+U53rst6hN3bCCUQtGgZMsTtqxn77s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636623063; 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=b3zexXfd0JGrVwZGj23TZV33qvUiiEVAhEMkcYqe5EA=; b=Lh67ELjrgwv4eYa4eVWZW654AJLB+mkdbWeLHrjuImyOEcWT7WeHngTZzdg1tTvsBCX2fBe30D/guJI+4keyEylAfgDXdRWFMNnnS0h7LBT9HdPpLTdvlKdvEHrbbZW8Wh9ZINwR9k0U1w3swg+epBYNGjircLVy8uxbyQ7swao= 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 1636623063690853.8466093717352; Thu, 11 Nov 2021 01:31:03 -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-495-emhNHRDTPWSxLAYYDAwtXQ-1; Thu, 11 Nov 2021 04:30:07 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 355461023F52; Thu, 11 Nov 2021 09:30:02 +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 DED9519C59; Thu, 11 Nov 2021 09:30:01 +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 8DFF01800FDD; Thu, 11 Nov 2021 09:30:01 +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 1AB9SUcK029390 for ; Thu, 11 Nov 2021 04:28:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id AD02667841; Thu, 11 Nov 2021 09:28:30 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2697467842 for ; Thu, 11 Nov 2021 09:28:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636623062; 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=b3zexXfd0JGrVwZGj23TZV33qvUiiEVAhEMkcYqe5EA=; b=IlWF8xMc/BoaqYzuCGRJIFxT2TUykHGejA1/Ox8IqGdXiMXsdwWzuw5qxyKFeLbxss5H6h dyy1ZSMD59O0oNZBvAZ/F9KuYcQSfsrw6E/KfZxA+IfTtB5koAXylObm+6J/GphB3P1Tk8 tSRwo55cZZVM0AXEfEmoj8C2ZQEteks= X-MC-Unique: emhNHRDTPWSxLAYYDAwtXQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/5] Use virNodeDeviceObjEndAPI() more Date: Thu, 11 Nov 2021 10:28:20 +0100 Message-Id: <52985305b6ccc78f44944cf3e106a4454c99337b.1636622879.git.mprivozn@redhat.com> 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.23 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: 1636623065436100001 Content-Type: text/plain; charset="utf-8" Instead of explicit virObjectUnlock(obj) + virObjectUnref(obj) combo the virNodeDeviceObjEndAPI() can be used. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/virnodedeviceobj.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 165ec1f1dd..15898a6aa7 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -524,8 +524,7 @@ virNodeDeviceObjListRemove(virNodeDeviceObjList *devs, virObjectRWLockWrite(devs); virObjectLock(obj); virNodeDeviceObjListRemoveLocked(devs, obj); - virObjectUnlock(obj); - virObjectUnref(obj); + virNodeDeviceObjEndAPI(&obj); virObjectRWUnlock(devs); } =20 --=20 2.32.0 From nobody Sun May 5 20:01:47 2024 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=1636623014; cv=none; d=zohomail.com; s=zohoarc; b=FO2iA29avtOclh9LsrVwuLS41u653b86GyT3KPM/HLi6gc3a+0G4iZFck6GT5XT3brnq8LOg1rs67P5QoSfx5mCxZ93C3BmMrgHveH9SSXA/dL15EMdJAhRP6R3rrfe2PF42o8EzYp6X1iEI9cX6y4QdpKvmqq0FmYouYmBHoy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636623014; 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=ZS7Uv1CnetCoLPTz9saLeHL/wHHdwG46f6B405vOZf8=; b=TFNQ8nl/q7BO/kOrf62+PCIQIRIwDjFNXnySxDcQnBewC0k3IoC9pdjJ4l33ODvQQgyFBaheQaxwqYAlskCKbXs6YdRUO2by9DeBUH8YcF/xc592dckL+kH76AwIJ28fWoHgJhEPyGy9YugDtM1Es7zipQvN9SDSvcL0Zk9vVEs= 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 163662301423595.4045145147079; Thu, 11 Nov 2021 01:30:14 -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-466-ujBq-RytNt-eOQJxBvfyHQ-1; Thu, 11 Nov 2021 04:30:09 -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 E63AA1006AA6; Thu, 11 Nov 2021 09:30:04 +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 C6AA367853; Thu, 11 Nov 2021 09:30:04 +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 819BE4EA30; Thu, 11 Nov 2021 09:30:04 +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 1AB9SVvW029395 for ; Thu, 11 Nov 2021 04:28:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 97CEE67848; Thu, 11 Nov 2021 09:28:31 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CDD667841 for ; Thu, 11 Nov 2021 09:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636623013; 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=ZS7Uv1CnetCoLPTz9saLeHL/wHHdwG46f6B405vOZf8=; b=ZB0AJqnLCmuF2IUOcavqdkP2X6H534v+TbFzrnttlSvBsgjbgOUKmh8OM1tVcAekngRc3b P8vNkn5AMDpAmhQ96aXToBjK/WwasxM+7/CjED7J/X6tqyUHhW/ihKhKQGXa1Sa1lt3efi 6uNn4uKWO2FJlD9IQDxHMyEemxT/Bc0= X-MC-Unique: ujBq-RytNt-eOQJxBvfyHQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 5/5] Use virSecretObjEndAPI() more Date: Thu, 11 Nov 2021 10:28:21 +0100 Message-Id: <03c1e91ad3f97dac40c1b317ee2e3ea34a575d44.1636622879.git.mprivozn@redhat.com> 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.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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1636623015103100001 Content-Type: text/plain; charset="utf-8" Instead of explicit virObjectUnlock(obj) + virObjectUnref(obj) combo the virSecretObjEndAPI() can be used. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- src/conf/virsecretobj.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index bdd5e4a6f7..212cfe103c 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -301,8 +301,7 @@ virSecretObjListRemove(virSecretObjList *secrets, virObjectRWLockWrite(secrets); virObjectLock(obj); virHashRemoveEntry(secrets->objs, uuidstr); - virObjectUnlock(obj); - virObjectUnref(obj); + virSecretObjEndAPI(&obj); virObjectRWUnlock(secrets); } =20 --=20 2.32.0