events: add NULL check in virObjectEventStateQueue

And remove NULL checking from all callers.

Signed-off-by: Anya Harter <aharter@redhat.com>

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 97e8d4eb3752041d1020ec89244ab1bfc7c4dc21..9284b51783e44a23ea76e0efab12b2611e284cc1 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -566,8 +566,7 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flag
     virDomainDefFree(def);
     virDomainDefFree(oldDef);
     virDomainObjEndAPI(&vm);
-    if (event)
-        virObjectEventStateQueue(privconn->domainEventState, event);
+    virObjectEventStateQueue(privconn->domainEventState, event);
 
     return dom;
 }
@@ -616,8 +615,7 @@ bhyveDomainUndefine(virDomainPtr domain)
 
  cleanup:
     virDomainObjEndAPI(&vm);
-    if (event)
-        virObjectEventStateQueue(privconn->domainEventState, event);
+    virObjectEventStateQueue(privconn->domainEventState, event);
     return ret;
 }
 
@@ -896,8 +894,7 @@ bhyveDomainCreateWithFlags(virDomainPtr dom,
 
  cleanup:
     virDomainObjEndAPI(&vm);
-    if (event)
-        virObjectEventStateQueue(privconn->domainEventState, event);
+    virObjectEventStateQueue(privconn->domainEventState, event);
     return ret;
 }
 
@@ -969,8 +966,7 @@ bhyveDomainCreateXML(virConnectPtr conn,
     virObjectUnref(caps);
     virDomainDefFree(def);
     virDomainObjEndAPI(&vm);
-    if (event)
-        virObjectEventStateQueue(privconn->domainEventState, event);
+    virObjectEventStateQueue(privconn->domainEventState, event);
 
     return dom;
 }
@@ -1002,8 +998,7 @@ bhyveDomainDestroy(virDomainPtr dom)
 
  cleanup:
     virDomainObjEndAPI(&vm);
-    if (event)
-        virObjectEventStateQueue(privconn->domainEventState, event);
+    virObjectEventStateQueue(privconn->domainEventState, event);
     return ret;
 }
 

diff --git a/src/conf/object_event.c b/src/conf/object_event.c
index 9a7e7e50c1ca28d3b33571f151c0402630bd24f8..826197000b2baae4b9aefee72a300a6d5fa9b0c2 100644 (file)
--- 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);
 }
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index a2e29a2121172d086f3aee4e5811aac6ebcf07af..cfb431488da80df920fd7b034408553ce51aaa98 100644 (file)
--- 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,
 
  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,
 
  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,
 
  cleanup:
     virDomainObjEndAPI(&vm);
-    if (event)
-        virObjectEventStateQueue(driver->domainEventState, event);
+    virObjectEventStateQueue(driver->domainEventState, event);
     return ret;
 }
 
@@ -1709,8 +1704,7 @@ static void lxcNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
             virDomainEventLifecycleNewFromObj(vm,
                                      VIR_DOMAIN_EVENT_DEFINED,
                                      VIR_DOMAIN_EVENT_DEFINED_ADDED);
-        if (event)
-            virObjectEventStateQueue(driver->domainEventState, event);
+        virObjectEventStateQueue(driver->domainEventState, event);
     }
 }
 
@@ -3100,8 +3094,7 @@ static int lxcDomainSuspend(virDomainPtr dom)
     virLXCDomainObjEndJob(driver, vm);
 
  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);
 
  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 cc6ed12526c12477b1d360370893304fa6e68a0b..60ae7daaeda5bb2fa8c04adc808ae8e7f5451ba0 100644 (file)
--- 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);
 
-    if (event)
-        virObjectEventStateQueue(driver->domainEventState, event);
+    virObjectEventStateQueue(driver->domainEventState, event);
 }
 
 /*
@@ -692,8 +691,7 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr 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);
 }
 
 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, event);
+            virObjectEventStateQueue(data->driver->domainEventState, event);
         }
     }
     virObjectUnlock(vm);

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 4b33e12b303a22747d995ecffa2a6b432186a339..ac849581ec11cf0dba48993bb8310c19b6410ebc 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -3579,8 +3579,7 @@ networkCreateXML(virConnectPtr conn,
 
  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 = virGetNetwork(conn, def->name, def->uuid);
 
  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 = 0;
 
  cleanup:
-    if (event)
-        virObjectEventStateQueue(driver->networkEventState, event);
+    virObjectEventStateQueue(driver->networkEventState, event);
     virNetworkObjEndAPI(&obj);
     return ret;
 }
@@ -3905,8 +3902,7 @@ networkCreate(virNetworkPtr net)
                                         0);
 
  cleanup:
-    if (event)
-        virObjectEventStateQueue(driver->networkEventState, event);
+    virObjectEventStateQueue(driver->networkEventState, event);
     virNetworkObjEndAPI(&obj);
     return ret;
 }
@@ -3952,8 +3948,7 @@ networkDestroy(virNetworkPtr net)
     }
 
  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_device_udev.c
index d34ec30379cbbf0364a6aba1bc7d27ccceaf41a3..22897591de47952d0aa5a738e6bcad9950550451 100644 (file)
--- 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);
 
-    if (event)
-        virObjectEventStateQueue(driver->nodeDeviceEventState, event);
+    virObjectEventStateQueue(driver->nodeDeviceEventState, event);
     return 0;
 }
 
@@ -1410,8 +1409,7 @@ udevAddOneDevice(struct udev_device *device)
     ret = 0;
 
  cleanup:
-    if (event)
-        virObjectEventStateQueue(driver->nodeDeviceEventState, event);
+    virObjectEventStateQueue(driver->nodeDeviceEventState, event);
 
     if (ret != 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 ac37fe121231c21e92231623a76a866cf8d3c2fa..756e9388583cf59da93c5abb09a186f5d59eb950 100644 (file)
--- 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);
 }
 
 

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 02fcaece35b5ff15810bf1dfebb31a74629d7f69..3c3557947e41ae6dbeaaac1ca85a1ae8dd3e6e5b 100644 (file)
--- 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);
 
     return ret;
 }
@@ -341,8 +340,7 @@ secretSetValue(virSecretPtr secret,
 
  cleanup:
     virSecretObjEndAPI(&obj);
-    if (event)
-        virObjectEventStateQueue(driver->secretEventState, event);
+    virObjectEventStateQueue(driver->secretEventState, event);
 
     return ret;
 }
@@ -420,8 +418,7 @@ secretUndefine(virSecretPtr secret)
 
  cleanup:
     virSecretObjEndAPI(&obj);
-    if (event)
-        virObjectEventStateQueue(driver->secretEventState, event);
+    virObjectEventStateQueue(driver->secretEventState, event);
 
     return ret;
 }

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index b125e2caf916e88f1edcb29bc153cd6ee41d5b14..254818e3089393099186bc214874bd1f4866d0db 100644 (file)
--- 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 = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL);
 
  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 = 0;
 
  cleanup:
-    if (event)
-        virObjectEventStateQueue(driver->storageEventState, event);
+    virObjectEventStateQueue(driver->storageEventState, event);
     virStoragePoolObjEndAPI(&obj);
     return ret;
 }
@@ -971,8 +968,7 @@ storagePoolCreate(virStoragePoolPtr pool,
 
  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 = 0;
 
  cleanup:
-    if (event)
-        virObjectEventStateQueue(driver->storageEventState, event);
+    virObjectEventStateQueue(driver->storageEventState, event);
     virStoragePoolObjEndAPI(&obj);
     return ret;
 }
@@ -1082,8 +1077,7 @@ storagePoolDestroy(virStoragePoolPtr pool)
     ret = 0;
 
  cleanup:
-    if (event)
-        virObjectEventStateQueue(driver->storageEventState, event);
+    virObjectEventStateQueue(driver->storageEventState, event);
     virStoragePoolObjEndAPI(&obj);
     return ret;
 }
@@ -1147,8 +1141,7 @@ storagePoolDelete(virStoragePoolPtr pool,
     ret = 0;
 
  cleanup:
-    if (event)
-        virObjectEventStateQueue(driver->storageEventState, event);
+    virObjectEventStateQueue(driver->storageEventState, event);
     virStoragePoolObjEndAPI(&obj);
     return ret;
 }
@@ -1210,8 +1203,7 @@ storagePoolRefresh(virStoragePoolPtr pool,
     ret = 0;
 
  cleanup:
-    if (event)
-        virObjectEventStateQueue(driver->storageEventState, event);
+    virObjectEventStateQueue(driver->storageEventState, event);
     virStoragePoolObjEndAPI(&obj);
     return ret;
 }
@@ -2301,8 +2293,7 @@ virStorageVolPoolRefreshThread(void *opaque)
     event = virStoragePoolEventRefreshNew(def->name, def->uuid);
 
  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 89121d4220443dab3cd8f727abc73959a0b50ec1..eb4e5aa3412d2fc2b2d35e3d782058d8a105e213 100644 (file)
--- 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);
 }
 

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index cb82b9d582f18b4a595b6985b3f57d8d3048b652..c6443d958e9fa9905a4e76493b225464fae6ed04 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2093,8 +2093,7 @@ prlsdkSendEvent(vzDriverPtr driver,
     event = virDomainEventLifecycleNewFromObj(dom,
                                               lvEventType,
                                               lvEventTypeDetails);
-    if (event)
-        virObjectEventStateQueue(driver->domainEventState, event);
+    virObjectEventStateQueue(driver->domainEventState, event);
 }
 
 static void