From nobody Sun Feb 8 16:06:23 2026 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 --- 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