From nobody Thu Mar 28 19:11:58 2024 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 1528745968348590.5913955051776; Mon, 11 Jun 2018 12:39:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C8682308123E; Mon, 11 Jun 2018 19:39:26 +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 8B0AC83073; Mon, 11 Jun 2018 19:39:26 +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 411571800C99; Mon, 11 Jun 2018 19:39:26 +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 w5BJcVWm023224 for ; Mon, 11 Jun 2018 15:38:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 541A32023489; Mon, 11 Jun 2018 19:38:31 +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 2871D2023487; Mon, 11 Jun 2018 19:38:31 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Mon, 11 Jun 2018 15:38:17 -0400 Message-Id: <4976330cafffbbf8cd01718e49304fd84948aba4.1528741339.git.aharter@redhat.com> 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 1/3] events: add NULL check in virObjectEventStateQueue 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.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 11 Jun 2018 19:39:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" And remove NULL checking from all callers Signed-off-by: Anya Harter --- src/bhyve/bhyve_driver.c | 15 +++++---------- src/conf/object_event.c | 3 +++ src/lxc/lxc_driver.c | 24 ++++++++---------------- src/lxc/lxc_process.c | 9 +++------ src/network/bridge_driver.c | 15 +++++---------- src/node_device/node_device_udev.c | 6 ++---- src/qemu/qemu_domain.c | 3 +-- src/secret/secret_driver.c | 9 +++------ src/storage/storage_driver.c | 27 +++++++++------------------ src/test/test_driver.c | 3 --- src/vz/vz_sdk.c | 3 +-- 11 files changed, 40 insertions(+), 77 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 97e8d4eb37..9284b51783 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -566,8 +566,7 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flag virDomainDefFree(def); virDomainDefFree(oldDef); virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(privconn->domainEventState, event); + virObjectEventStateQueue(privconn->domainEventState, event); =20 return dom; } @@ -616,8 +615,7 @@ bhyveDomainUndefine(virDomainPtr domain) =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(privconn->domainEventState, event); + virObjectEventStateQueue(privconn->domainEventState, event); return ret; } =20 @@ -896,8 +894,7 @@ bhyveDomainCreateWithFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(privconn->domainEventState, event); + virObjectEventStateQueue(privconn->domainEventState, event); return ret; } =20 @@ -969,8 +966,7 @@ bhyveDomainCreateXML(virConnectPtr conn, virObjectUnref(caps); virDomainDefFree(def); virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(privconn->domainEventState, event); + virObjectEventStateQueue(privconn->domainEventState, event); =20 return dom; } @@ -1002,8 +998,7 @@ bhyveDomainDestroy(virDomainPtr dom) =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(privconn->domainEventState, event); + virObjectEventStateQueue(privconn->domainEventState, event); return ret; } =20 diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 9a7e7e50c1..826197000b 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -776,6 +776,9 @@ void virObjectEventStateQueue(virObjectEventStatePtr state, virObjectEventPtr event) { + if (!event) + return; + virObjectEventStateQueueRemote(state, event, -1); } =20 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a2e29a2121..cfb431488d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -499,8 +499,7 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char = *xml, unsigned int flags) virDomainDefFree(def); virDomainDefFree(oldDef); virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); virObjectUnref(cfg); return dom; @@ -553,8 +552,7 @@ static int lxcDomainUndefineFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; } @@ -1132,8 +1130,7 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); return ret; @@ -1260,8 +1257,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, cleanup: virDomainDefFree(def); virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); @@ -1516,8 +1512,7 @@ lxcDomainDestroyFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); return ret; } =20 @@ -1709,8 +1704,7 @@ static void lxcNotifyLoadDomain(virDomainObjPtr vm, i= nt newVM, void *opaque) virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED_ADDED); - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); } } =20 @@ -3100,8 +3094,7 @@ static int lxcDomainSuspend(virDomainPtr dom) virLXCDomainObjEndJob(driver, vm); =20 cleanup: - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; @@ -3158,8 +3151,7 @@ static int lxcDomainResume(virDomainPtr dom) virLXCDomainObjEndJob(driver, vm); =20 cleanup: - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index cc6ed12526..60ae7daaed 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -82,8 +82,7 @@ lxcProcessAutoDestroy(virDomainObjPtr dom, if (!dom->persistent) virDomainObjListRemove(driver->domains, dom); =20 - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 /* @@ -692,8 +691,7 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitor= Ptr mon, * before adding monitorCallbacks. Since we are now done with the @vm * we can Unref/Unlock */ virDomainObjEndAPI(&vm); - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_= UNUSED, @@ -1607,8 +1605,7 @@ virLXCProcessAutostartDomain(virDomainObjPtr vm, virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_BOOTED); - if (event) - virObjectEventStateQueue(data->driver->domainEventState, e= vent); + virObjectEventStateQueue(data->driver->domainEventState, event= ); } } virObjectUnlock(vm); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4b33e12b30..ac849581ec 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3579,8 +3579,7 @@ networkCreateXML(virConnectPtr conn, =20 cleanup: virNetworkDefFree(newDef); - if (event) - virObjectEventStateQueue(driver->networkEventState, event); + virObjectEventStateQueue(driver->networkEventState, event); virNetworkObjEndAPI(&obj); return net; } @@ -3633,8 +3632,7 @@ networkDefineXML(virConnectPtr conn, net =3D virGetNetwork(conn, def->name, def->uuid); =20 cleanup: - if (event) - virObjectEventStateQueue(driver->networkEventState, event); + virObjectEventStateQueue(driver->networkEventState, event); if (freeDef) virNetworkDefFree(def); virNetworkObjEndAPI(&obj); @@ -3694,8 +3692,7 @@ networkUndefine(virNetworkPtr net) ret =3D 0; =20 cleanup: - if (event) - virObjectEventStateQueue(driver->networkEventState, event); + virObjectEventStateQueue(driver->networkEventState, event); virNetworkObjEndAPI(&obj); return ret; } @@ -3905,8 +3902,7 @@ networkCreate(virNetworkPtr net) 0); =20 cleanup: - if (event) - virObjectEventStateQueue(driver->networkEventState, event); + virObjectEventStateQueue(driver->networkEventState, event); virNetworkObjEndAPI(&obj); return ret; } @@ -3952,8 +3948,7 @@ networkDestroy(virNetworkPtr net) } =20 cleanup: - if (event) - virObjectEventStateQueue(driver->networkEventState, event); + virObjectEventStateQueue(driver->networkEventState, event); virNetworkObjEndAPI(&obj); return ret; } diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index d34ec30379..22897591de 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1297,8 +1297,7 @@ udevRemoveOneDevice(struct udev_device *device) virNodeDeviceObjListRemove(driver->devs, obj); virObjectUnref(obj); =20 - if (event) - virObjectEventStateQueue(driver->nodeDeviceEventState, event); + virObjectEventStateQueue(driver->nodeDeviceEventState, event); return 0; } =20 @@ -1410,8 +1409,7 @@ udevAddOneDevice(struct udev_device *device) ret =3D 0; =20 cleanup: - if (event) - virObjectEventStateQueue(driver->nodeDeviceEventState, event); + virObjectEventStateQueue(driver->nodeDeviceEventState, event); =20 if (ret !=3D 0) { VIR_DEBUG("Discarding device %d %p %s", ret, def, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 11c261db1a..3d4e96c6bd 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -259,8 +259,7 @@ qemuDomainDisableNamespace(virDomainObjPtr vm, void qemuDomainEventQueue(virQEMUDriverPtr driver, virObjectEventPtr event) { - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 =20 diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 02fcaece35..3c3557947e 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -278,8 +278,7 @@ secretDefineXML(virConnectPtr conn, cleanup: virSecretDefFree(def); virSecretObjEndAPI(&obj); - if (event) - virObjectEventStateQueue(driver->secretEventState, event); + virObjectEventStateQueue(driver->secretEventState, event); =20 return ret; } @@ -341,8 +340,7 @@ secretSetValue(virSecretPtr secret, =20 cleanup: virSecretObjEndAPI(&obj); - if (event) - virObjectEventStateQueue(driver->secretEventState, event); + virObjectEventStateQueue(driver->secretEventState, event); =20 return ret; } @@ -420,8 +418,7 @@ secretUndefine(virSecretPtr secret) =20 cleanup: virSecretObjEndAPI(&obj); - if (event) - virObjectEventStateQueue(driver->secretEventState, event); + virObjectEventStateQueue(driver->secretEventState, event); =20 return ret; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index b125e2caf9..254818e308 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -772,8 +772,7 @@ storagePoolCreateXML(virConnectPtr conn, cleanup: VIR_FREE(stateFile); virStoragePoolDefFree(newDef); - if (event) - virObjectEventStateQueue(driver->storageEventState, event); + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjEndAPI(&obj); return pool; } @@ -829,8 +828,7 @@ storagePoolDefineXML(virConnectPtr conn, pool =3D virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); =20 cleanup: - if (event) - virObjectEventStateQueue(driver->storageEventState, event); + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolDefFree(newDef); virStoragePoolObjEndAPI(&obj); return pool; @@ -889,8 +887,7 @@ storagePoolUndefine(virStoragePoolPtr pool) ret =3D 0; =20 cleanup: - if (event) - virObjectEventStateQueue(driver->storageEventState, event); + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjEndAPI(&obj); return ret; } @@ -971,8 +968,7 @@ storagePoolCreate(virStoragePoolPtr pool, =20 cleanup: VIR_FREE(stateFile); - if (event) - virObjectEventStateQueue(driver->storageEventState, event); + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjEndAPI(&obj); return ret; } @@ -1016,8 +1012,7 @@ storagePoolBuild(virStoragePoolPtr pool, ret =3D 0; =20 cleanup: - if (event) - virObjectEventStateQueue(driver->storageEventState, event); + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjEndAPI(&obj); return ret; } @@ -1082,8 +1077,7 @@ storagePoolDestroy(virStoragePoolPtr pool) ret =3D 0; =20 cleanup: - if (event) - virObjectEventStateQueue(driver->storageEventState, event); + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjEndAPI(&obj); return ret; } @@ -1147,8 +1141,7 @@ storagePoolDelete(virStoragePoolPtr pool, ret =3D 0; =20 cleanup: - if (event) - virObjectEventStateQueue(driver->storageEventState, event); + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjEndAPI(&obj); return ret; } @@ -1210,8 +1203,7 @@ storagePoolRefresh(virStoragePoolPtr pool, ret =3D 0; =20 cleanup: - if (event) - virObjectEventStateQueue(driver->storageEventState, event); + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjEndAPI(&obj); return ret; } @@ -2301,8 +2293,7 @@ virStorageVolPoolRefreshThread(void *opaque) event =3D virStoragePoolEventRefreshNew(def->name, def->uuid); =20 cleanup: - if (event) - virObjectEventStateQueue(driver->storageEventState, event); + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjEndAPI(&obj); virStorageVolPoolRefreshDataFree(cbdata); } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 89121d4220..eb4e5aa341 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -177,9 +177,6 @@ static void testDriverUnlock(testDriverPtr driver) static void testObjectEventQueue(testDriverPtr driver, virObjectEventPtr event) { - if (!event) - return; - virObjectEventStateQueue(driver->eventState, event); } =20 diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index cb82b9d582..c6443d958e 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2093,8 +2093,7 @@ prlsdkSendEvent(vzDriverPtr driver, event =3D virDomainEventLifecycleNewFromObj(dom, lvEventType, lvEventTypeDetails); - if (event) - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(driver->domainEventState, event); } =20 static void --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Mar 28 19:11:58 2024 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 From nobody Thu Mar 28 19:11:58 2024 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 1528745945655784.581376595892; Mon, 11 Jun 2018 12:39:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFF9213A5C; Mon, 11 Jun 2018 19:39:03 +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 BEB342010CA0; Mon, 11 Jun 2018 19:39:03 +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 6BB824CA80; Mon, 11 Jun 2018 19:39:03 +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 w5BJcbof023245 for ; Mon, 11 Jun 2018 15:38:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6CCAD2023488; Mon, 11 Jun 2018 19:38:37 +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 49D0D2023487; Mon, 11 Jun 2018 19:38:37 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Mon, 11 Jun 2018 15:38:19 -0400 Message-Id: <2668ff4c024caf8f7f5f3eedebd39d736e7fa74f.1528741339.git.aharter@redhat.com> 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 3/3] events: remove remoteEventQueue wrapper function 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.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 11 Jun 2018 19:39:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" >From remote_driver.c And replace all calls with virObjectEventStateQueue such that: remoteEventQueue(priv, event, callbackID); becomes: virObjectEventStateQueue(priv->eventState, event, callbackID); Signed-off-by: Anya Harter --- src/remote/remote_driver.c | 74 +++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fbec5c727b..c36941c27e 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4431,14 +4431,6 @@ remoteConnectDomainEventDeregister(virConnectPtr con= n, } =20 =20 -static void -remoteEventQueue(struct private_data *priv, virObjectEventPtr event, - int remoteID) -{ - virObjectEventStateQueueRemote(priv->eventState, event, remoteID); -} - - static void remoteDomainBuildEventLifecycleHelper(virConnectPtr conn, remote_domain_event_lifecycle_msg *m= sg, @@ -4455,7 +4447,7 @@ remoteDomainBuildEventLifecycleHelper(virConnectPtr c= onn, event =3D virDomainEventLifecycleNewFromDom(dom, msg->event, msg->deta= il); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, @@ -4493,7 +4485,7 @@ remoteDomainBuildEventRebootHelper(virConnectPtr conn, event =3D virDomainEventRebootNewFromDom(dom); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, @@ -4530,7 +4522,7 @@ remoteDomainBuildEventRTCChangeHelper(virConnectPtr c= onn, event =3D virDomainEventRTCChangeNewFromDom(dom, msg->offset); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventRTCChange(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, @@ -4567,7 +4559,7 @@ remoteDomainBuildEventWatchdogHelper(virConnectPtr co= nn, event =3D virDomainEventWatchdogNewFromDom(dom, msg->action); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventWatchdog(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, @@ -4607,7 +4599,7 @@ remoteDomainBuildEventIOErrorHelper(virConnectPtr con= n, msg->action); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventIOError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, @@ -4649,7 +4641,7 @@ remoteDomainBuildEventIOErrorReasonHelper(virConnectP= tr conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventIOErrorReason(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, @@ -4688,7 +4680,7 @@ remoteDomainBuildEventBlockJobHelper(virConnectPtr co= nn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, @@ -4728,7 +4720,7 @@ remoteDomainBuildEventBlockJob2(virNetClientProgramPt= r prog ATTRIBUTE_UNUSED, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -4782,7 +4774,7 @@ remoteDomainBuildEventGraphicsHelper(virConnectPtr co= nn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); return; =20 error: @@ -4843,7 +4835,7 @@ remoteDomainBuildEventControlErrorHelper(virConnectPt= r conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventControlError(virNetClientProgramPtr prog ATTRIBUTE_U= NUSED, @@ -4886,7 +4878,7 @@ remoteDomainBuildEventDiskChangeHelper(virConnectPtr = conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, @@ -4927,7 +4919,7 @@ remoteDomainBuildEventTrayChangeHelper(virConnectPtr = conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventTrayChange(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, @@ -4966,7 +4958,7 @@ remoteDomainBuildEventPMWakeupHelper(virConnectPtr co= nn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventPMWakeup(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, @@ -5006,7 +4998,7 @@ remoteDomainBuildEventPMSuspendHelper(virConnectPtr c= onn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventPMSuspend(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, @@ -5045,7 +5037,7 @@ remoteDomainBuildEventBalloonChangeHelper(virConnectP= tr conn, event =3D virDomainEventBalloonChangeNewFromDom(dom, msg->actual); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventBalloonChange(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, @@ -5085,7 +5077,7 @@ remoteDomainBuildEventPMSuspendDiskHelper(virConnectP= tr conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, @@ -5125,7 +5117,7 @@ remoteDomainBuildEventDeviceRemovedHelper(virConnectP= tr conn, =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void remoteDomainBuildEventDeviceRemoved(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, @@ -5165,7 +5157,7 @@ remoteDomainBuildEventCallbackDeviceAdded(virNetClien= tProgramPtr prog ATTRIBUTE_ =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5187,7 +5179,7 @@ remoteDomainBuildEventCallbackDeviceRemovalFailed(vir= NetClientProgramPtr prog AT =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5219,7 +5211,7 @@ remoteDomainBuildEventCallbackTunable(virNetClientPro= gramPtr prog ATTRIBUTE_UNUS =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5242,7 +5234,7 @@ remoteDomainBuildEventCallbackAgentLifecycle(virNetCl= ientProgramPtr prog ATTRIBU =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5265,7 +5257,7 @@ remoteDomainBuildEventCallbackMigrationIteration(virN= etClientProgramPtr prog ATT =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5298,7 +5290,7 @@ remoteDomainBuildEventCallbackJobCompleted(virNetClie= ntProgramPtr prog ATTRIBUTE =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5320,7 +5312,7 @@ remoteDomainBuildEventCallbackMetadataChange(virNetCl= ientProgramPtr prog ATTRIBU =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5343,7 +5335,7 @@ remoteNetworkBuildEventLifecycle(virNetClientProgramP= tr prog ATTRIBUTE_UNUSED, msg->detail); virObjectUnref(net); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5365,7 +5357,7 @@ remoteStoragePoolBuildEventLifecycle(virNetClientProg= ramPtr prog ATTRIBUTE_UNUSE msg->detail); virObjectUnref(pool); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5386,7 +5378,7 @@ remoteStoragePoolBuildEventRefresh(virNetClientProgra= mPtr prog ATTRIBUTE_UNUSED, event =3D virStoragePoolEventRefreshNew(pool->name, pool->uuid); virObjectUnref(pool); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5408,7 +5400,7 @@ remoteNodeDeviceBuildEventLifecycle(virNetClientProgr= amPtr prog ATTRIBUTE_UNUSED msg->detail); virObjectUnref(dev); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5429,7 +5421,7 @@ remoteNodeDeviceBuildEventUpdate(virNetClientProgramP= tr prog ATTRIBUTE_UNUSED, event =3D virNodeDeviceEventUpdateNew(dev->name); virObjectUnref(dev); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5451,7 +5443,7 @@ remoteSecretBuildEventLifecycle(virNetClientProgramPt= r prog ATTRIBUTE_UNUSED, msg->event, msg->detail); virObjectUnref(secret); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5472,7 +5464,7 @@ remoteSecretBuildEventValueChanged(virNetClientProgra= mPtr prog ATTRIBUTE_UNUSED, event =3D virSecretEventValueChangedNew(secret->uuid, secret->usageTyp= e, secret->usageID); virObjectUnref(secret); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 static void @@ -5496,7 +5488,7 @@ remoteDomainBuildQemuMonitorEvent(virNetClientProgram= Ptr prog ATTRIBUTE_UNUSED, msg->details ? *msg->details : NU= LL); virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 @@ -5555,7 +5547,7 @@ remoteDomainBuildEventBlockThreshold(virNetClientProg= ramPtr prog ATTRIBUTE_UNUSE =20 virObjectUnref(dom); =20 - remoteEventQueue(priv, event, msg->callbackID); + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackI= D); } =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list