From nobody Wed May 14 11:20:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522925518817183.17659067951763; Thu, 5 Apr 2018 03:51:58 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 6FD9FC04BE27; Thu, 5 Apr 2018 10:51:57 +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 418626A251; Thu, 5 Apr 2018 10:51:57 +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 C78D31800CA2; Thu, 5 Apr 2018 10:51:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35Aprgo006084 for ; Thu, 5 Apr 2018 06:51:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC37D2024CA6; Thu, 5 Apr 2018 10:51:52 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id D86DE2024CA4; Thu, 5 Apr 2018 10:51:51 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 11:51:41 +0100 Message-Id: <20180405105147.20196-3-berrange@redhat.com> In-Reply-To: <20180405105147.20196-1-berrange@redhat.com> References: <20180405105147.20196-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/8] remote: push check for conn down into remoteClientFreePrivateCallbacks 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 05 Apr 2018 10:51:57 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 There will shortly be many connection objects, so we should not assume a single check against priv->conn is sufficient. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/remote/remote_daemon_dispatch.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 121d114ae3..853e63901b 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1673,6 +1673,11 @@ void remoteRelayConnectionClosedEvent(virConnectPtr = conn ATTRIBUTE_UNUSED, int r #define DEREG_CB(conn, eventCallbacks, neventCallbacks, deregFcn, name) \ do { \ size_t i; \ + if (neventCallbacks && !conn) { \ + VIR_WARN("Have %zu %s event callbacks but no connection", \ + neventCallbacks, name); \ + break; \ + } \ for (i =3D 0; i < neventCallbacks; i++) { \ int callbackID =3D eventCallbacks[i]->callbackID; \ if (callbackID < 0) { \ @@ -1715,7 +1720,7 @@ remoteClientFreePrivateCallbacks(struct daemonClientP= rivate *priv) priv->nqemuEventCallbacks, virConnectDomainQemuMonitorEventDeregister, "qemu monitor"); =20 - if (priv->closeRegistered) { + if (priv->closeRegistered && priv->conn) { if (virConnectUnregisterCloseCallback(priv->conn, remoteRelayConnectionClosedE= vent) < 0) VIR_WARN("unexpected close callback event deregister failure"); @@ -1751,9 +1756,7 @@ static void remoteClientCloseFunc(virNetServerClientP= tr client) =20 daemonRemoveAllClientStreams(priv->streams); =20 - /* Deregister event delivery callback */ - if (priv->conn) - remoteClientFreePrivateCallbacks(priv); + remoteClientFreePrivateCallbacks(priv); } =20 =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list