openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

events: add NULL check in virObjectEventStateQueue 

And remove NULL checking from all callers.

Signed-off-by: Anya Harter <aharter@redhat.com>
This commit is contained in:
Anya Harter 2018-06-11 15:38:17 -04:00 committed by Pavel Hrdina
parent 4e3a9daa66
commit 031eb8f6dc
11 changed files with 40 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bhyve/bhyve_driver.c
View File

@ -566,7 +566,6 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flag
virDomainDefFree(def); virDomainDefFree(def);
virDomainDefFree(oldDef); virDomainDefFree(oldDef);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(privconn->domainEventState, event); virObjectEventStateQueue(privconn->domainEventState, event);
return dom; return dom;
@ -616,7 +615,6 @@ bhyveDomainUndefine(virDomainPtr domain)
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(privconn->domainEventState, event); virObjectEventStateQueue(privconn->domainEventState, event);
return ret; return ret;
} }
@ -896,7 +894,6 @@ bhyveDomainCreateWithFlags(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(privconn->domainEventState, event); virObjectEventStateQueue(privconn->domainEventState, event);
return ret; return ret;
} }
@ -969,7 +966,6 @@ bhyveDomainCreateXML(virConnectPtr conn,
virObjectUnref(caps); virObjectUnref(caps);
virDomainDefFree(def); virDomainDefFree(def);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(privconn->domainEventState, event); virObjectEventStateQueue(privconn->domainEventState, event);
return dom; return dom;
@ -1002,7 +998,6 @@ bhyveDomainDestroy(virDomainPtr dom)
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(privconn->domainEventState, event); virObjectEventStateQueue(privconn->domainEventState, event);
return ret; return ret;
} }

3
src/conf/object_event.c
View File

@ -776,6 +776,9 @@ void
virObjectEventStateQueue(virObjectEventStatePtr state, virObjectEventStateQueue(virObjectEventStatePtr state,
virObjectEventPtr event) virObjectEventPtr event)
{ {
if (!event)
return;
virObjectEventStateQueueRemote(state, event, -1); virObjectEventStateQueueRemote(state, event, -1);
} }

8
src/lxc/lxc_driver.c
View File

@ -499,7 +499,6 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
virDomainDefFree(def); virDomainDefFree(def);
virDomainDefFree(oldDef); virDomainDefFree(oldDef);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
@ -553,7 +552,6 @@ static int lxcDomainUndefineFlags(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
@ -1132,7 +1130,6 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(cfg); virObjectUnref(cfg);
virNWFilterUnlockFilterUpdates(); virNWFilterUnlockFilterUpdates();
@ -1260,7 +1257,6 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
cleanup: cleanup:
virDomainDefFree(def); virDomainDefFree(def);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virObjectUnref(caps); virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
@ -1516,7 +1512,6 @@ lxcDomainDestroyFlags(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
return ret; return ret;
} }
@ -1709,7 +1704,6 @@ static void lxcNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
virDomainEventLifecycleNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
VIR_DOMAIN_EVENT_DEFINED_ADDED); VIR_DOMAIN_EVENT_DEFINED_ADDED);
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }
} }
@ -3100,7 +3094,6 @@ static int lxcDomainSuspend(virDomainPtr dom)
virLXCDomainObjEndJob(driver, vm); virLXCDomainObjEndJob(driver, vm);
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(cfg); virObjectUnref(cfg);
@ -3158,7 +3151,6 @@ static int lxcDomainResume(virDomainPtr dom)
virLXCDomainObjEndJob(driver, vm); virLXCDomainObjEndJob(driver, vm);
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(cfg); virObjectUnref(cfg);

3
src/lxc/lxc_process.c
View File

@ -82,7 +82,6 @@ lxcProcessAutoDestroy(virDomainObjPtr dom,
if (!dom->persistent) if (!dom->persistent)
virDomainObjListRemove(driver->domains, dom); virDomainObjListRemove(driver->domains, dom);
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }
@ -692,7 +691,6 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon,
* before adding monitorCallbacks. Since we are now done with the @vm * before adding monitorCallbacks. Since we are now done with the @vm
* we can Unref/Unlock */ * we can Unref/Unlock */
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }
@ -1607,7 +1605,6 @@ virLXCProcessAutostartDomain(virDomainObjPtr vm,
virDomainEventLifecycleNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
if (event)
virObjectEventStateQueue(data->driver->domainEventState, event); virObjectEventStateQueue(data->driver->domainEventState, event);
} }
} }

5
src/network/bridge_driver.c
View File

@ -3579,7 +3579,6 @@ networkCreateXML(virConnectPtr conn,
cleanup: cleanup:
virNetworkDefFree(newDef); virNetworkDefFree(newDef);
if (event)
virObjectEventStateQueue(driver->networkEventState, event); virObjectEventStateQueue(driver->networkEventState, event);
virNetworkObjEndAPI(&obj); virNetworkObjEndAPI(&obj);
return net; return net;
@ -3633,7 +3632,6 @@ networkDefineXML(virConnectPtr conn,
net = virGetNetwork(conn, def->name, def->uuid); net = virGetNetwork(conn, def->name, def->uuid);
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->networkEventState, event); virObjectEventStateQueue(driver->networkEventState, event);
if (freeDef) if (freeDef)
virNetworkDefFree(def); virNetworkDefFree(def);
@ -3694,7 +3692,6 @@ networkUndefine(virNetworkPtr net)
ret = 0; ret = 0;
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->networkEventState, event); virObjectEventStateQueue(driver->networkEventState, event);
virNetworkObjEndAPI(&obj); virNetworkObjEndAPI(&obj);
return ret; return ret;
@ -3905,7 +3902,6 @@ networkCreate(virNetworkPtr net)
0); 0);
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->networkEventState, event); virObjectEventStateQueue(driver->networkEventState, event);
virNetworkObjEndAPI(&obj); virNetworkObjEndAPI(&obj);
return ret; return ret;
@ -3952,7 +3948,6 @@ networkDestroy(virNetworkPtr net)
} }
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->networkEventState, event); virObjectEventStateQueue(driver->networkEventState, event);
virNetworkObjEndAPI(&obj); virNetworkObjEndAPI(&obj);
return ret; return ret;

2
src/node_device/node_device_udev.c
View File

@ -1297,7 +1297,6 @@ udevRemoveOneDevice(struct udev_device *device)
virNodeDeviceObjListRemove(driver->devs, obj); virNodeDeviceObjListRemove(driver->devs, obj);
virObjectUnref(obj); virObjectUnref(obj);
if (event)
virObjectEventStateQueue(driver->nodeDeviceEventState, event); virObjectEventStateQueue(driver->nodeDeviceEventState, event);
return 0; return 0;
} }
@ -1410,7 +1409,6 @@ udevAddOneDevice(struct udev_device *device)
ret = 0; ret = 0;
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->nodeDeviceEventState, event); virObjectEventStateQueue(driver->nodeDeviceEventState, event);
if (ret != 0) { if (ret != 0) {

1
src/qemu/qemu_domain.c
View File

@ -259,7 +259,6 @@ qemuDomainDisableNamespace(virDomainObjPtr vm,
void qemuDomainEventQueue(virQEMUDriverPtr driver, void qemuDomainEventQueue(virQEMUDriverPtr driver,
virObjectEventPtr event) virObjectEventPtr event)
{ {
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }

3
src/secret/secret_driver.c
View File

@ -278,7 +278,6 @@ secretDefineXML(virConnectPtr conn,
cleanup: cleanup:
virSecretDefFree(def); virSecretDefFree(def);
virSecretObjEndAPI(&obj); virSecretObjEndAPI(&obj);
if (event)
virObjectEventStateQueue(driver->secretEventState, event); virObjectEventStateQueue(driver->secretEventState, event);
return ret; return ret;
@ -341,7 +340,6 @@ secretSetValue(virSecretPtr secret,
cleanup: cleanup:
virSecretObjEndAPI(&obj); virSecretObjEndAPI(&obj);
if (event)
virObjectEventStateQueue(driver->secretEventState, event); virObjectEventStateQueue(driver->secretEventState, event);
return ret; return ret;
@ -420,7 +418,6 @@ secretUndefine(virSecretPtr secret)
cleanup: cleanup:
virSecretObjEndAPI(&obj); virSecretObjEndAPI(&obj);
if (event)
virObjectEventStateQueue(driver->secretEventState, event); virObjectEventStateQueue(driver->secretEventState, event);
return ret; return ret;

9
src/storage/storage_driver.c
View File

@ -772,7 +772,6 @@ storagePoolCreateXML(virConnectPtr conn,
cleanup: cleanup:
VIR_FREE(stateFile); VIR_FREE(stateFile);
virStoragePoolDefFree(newDef); virStoragePoolDefFree(newDef);
if (event)
virObjectEventStateQueue(driver->storageEventState, event); virObjectEventStateQueue(driver->storageEventState, event);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
return pool; return pool;
@ -829,7 +828,6 @@ storagePoolDefineXML(virConnectPtr conn,
pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL);
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->storageEventState, event); virObjectEventStateQueue(driver->storageEventState, event);
virStoragePoolDefFree(newDef); virStoragePoolDefFree(newDef);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
@ -889,7 +887,6 @@ storagePoolUndefine(virStoragePoolPtr pool)
ret = 0; ret = 0;
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->storageEventState, event); virObjectEventStateQueue(driver->storageEventState, event);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
return ret; return ret;
@ -971,7 +968,6 @@ storagePoolCreate(virStoragePoolPtr pool,
cleanup: cleanup:
VIR_FREE(stateFile); VIR_FREE(stateFile);
if (event)
virObjectEventStateQueue(driver->storageEventState, event); virObjectEventStateQueue(driver->storageEventState, event);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
return ret; return ret;
@ -1016,7 +1012,6 @@ storagePoolBuild(virStoragePoolPtr pool,
ret = 0; ret = 0;
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->storageEventState, event); virObjectEventStateQueue(driver->storageEventState, event);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
return ret; return ret;
@ -1082,7 +1077,6 @@ storagePoolDestroy(virStoragePoolPtr pool)
ret = 0; ret = 0;
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->storageEventState, event); virObjectEventStateQueue(driver->storageEventState, event);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
return ret; return ret;
@ -1147,7 +1141,6 @@ storagePoolDelete(virStoragePoolPtr pool,
ret = 0; ret = 0;
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->storageEventState, event); virObjectEventStateQueue(driver->storageEventState, event);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
return ret; return ret;
@ -1210,7 +1203,6 @@ storagePoolRefresh(virStoragePoolPtr pool,
ret = 0; ret = 0;
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->storageEventState, event); virObjectEventStateQueue(driver->storageEventState, event);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
return ret; return ret;
@ -2301,7 +2293,6 @@ virStorageVolPoolRefreshThread(void *opaque)
event = virStoragePoolEventRefreshNew(def->name, def->uuid); event = virStoragePoolEventRefreshNew(def->name, def->uuid);
cleanup: cleanup:
if (event)
virObjectEventStateQueue(driver->storageEventState, event); virObjectEventStateQueue(driver->storageEventState, event);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
virStorageVolPoolRefreshDataFree(cbdata); virStorageVolPoolRefreshDataFree(cbdata);

3
src/test/test_driver.c
View File

@ -177,9 +177,6 @@ static void testDriverUnlock(testDriverPtr driver)
static void testObjectEventQueue(testDriverPtr driver, static void testObjectEventQueue(testDriverPtr driver,
virObjectEventPtr event) virObjectEventPtr event)
{ {
if (!event)
return;
virObjectEventStateQueue(driver->eventState, event); virObjectEventStateQueue(driver->eventState, event);
} }

1
src/vz/vz_sdk.c
View File

@ -2093,7 +2093,6 @@ prlsdkSendEvent(vzDriverPtr driver,
event = virDomainEventLifecycleNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
lvEventType, lvEventType,
lvEventTypeDetails); lvEventTypeDetails);
if (event)
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
} }