From nobody Tue May 13 23:27:55 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528745924225980.3784053495355; Mon, 11 Jun 2018 12:38:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B8D8130015C0; Mon, 11 Jun 2018 19:38:41 +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 5241AB15E0; Mon, 11 Jun 2018 19:38: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 8ABD91800FC1; Mon, 11 Jun 2018 19:38:37 +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 w5BJcYbn023234 for ; Mon, 11 Jun 2018 15:38:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 99B522023488; Mon, 11 Jun 2018 19:38:34 +0000 (UTC) Received: from dhcp-17-130.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 776662023487; Mon, 11 Jun 2018 19:38:34 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Mon, 11 Jun 2018 15:38:18 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH libvirt 2/3] events: move NULL check to EventStateQueueRemote 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 11 Jun 2018 19:38:43 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Remove NULL check from virObjectEventStateQueue and add NULL check to virOb= jectEventStateQueueRemote Remove NULL check around call to virObjectEventStateQueueRemote in remote_driver.c Signed-off-by: Anya Harter --- src/conf/object_event.c | 6 +++--- src/remote/remote_driver.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 826197000b..dd5c6ff32d 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -744,6 +744,9 @@ virObjectEventStateQueueRemote(virObjectEventStatePtr s= tate, virObjectEventPtr event, int remoteID) { + if (!event) + return; + if (state->timer < 0) { virObjectUnref(event); return; @@ -776,9 +779,6 @@ void virObjectEventStateQueue(virObjectEventStatePtr state, virObjectEventPtr event) { - if (!event) - return; - virObjectEventStateQueueRemote(state, event, -1); } =20 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index c22993ce9e..fbec5c727b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4435,8 +4435,7 @@ static void remoteEventQueue(struct private_data *priv, virObjectEventPtr event, int remoteID) { - if (event) - virObjectEventStateQueueRemote(priv->eventState, event, remoteID); + virObjectEventStateQueueRemote(priv->eventState, event, remoteID); } =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list