External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

events: remove umlDomainEventQueue wrapper func

Browse Source 
And replace all calls with virObjectEventStateQueue such that:

    umlDomainEventQueue(driver, event);

becomes:

    virObjectEventStateQueue(driver->domainEventState, event);

And remove NULL checking from all callers.

Signed-off-by: Anya Harter <aharter@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Anya Harter 2018-06-12 13:33:03 -04:00 committed by Ján Tomko
parent b850492461
commit 8bf612495d
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/uml/uml_driver.c
View File

@ -125,8 +125,6 @@ static int umlOpenMonitor(struct uml_driver *driver,
virDomainObjPtr vm); virDomainObjPtr vm);
static int umlReadPidFile(struct uml_driver *driver, static int umlReadPidFile(struct uml_driver *driver,
virDomainObjPtr vm); virDomainObjPtr vm);
static void umlDomainEventQueue(struct uml_driver *driver,
virObjectEventPtr event);
static int umlStartVMDaemon(virConnectPtr conn, static int umlStartVMDaemon(virConnectPtr conn,
struct uml_driver *driver, struct uml_driver *driver,
@ -228,8 +226,7 @@ umlAutostartDomain(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);
umlDomainEventQueue(data->driver, event);
} }
} }
virObjectUnlock(vm); virObjectUnlock(vm);
@ -425,10 +422,8 @@ umlInotifyEvent(int watch,
} }
} }
virDomainObjEndAPI(&dom); virDomainObjEndAPI(&dom);
if (event) { virObjectEventStateQueue(driver->domainEventState, event);
umlDomainEventQueue(driver, event); event = NULL;
event = NULL;
}
} }
cleanup: cleanup:
@ -646,8 +641,7 @@ static void umlNotifyLoadDomain(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);
umlDomainEventQueue(driver, event);
} }
} }
@ -783,8 +777,7 @@ static int umlProcessAutoDestroyDom(void *payload,
virDomainObjListRemove(data->driver->domains, dom); virDomainObjListRemove(data->driver->domains, dom);
virDomainObjEndAPI(&dom); virDomainObjEndAPI(&dom);
if (event) virObjectEventStateQueue(data->driver->domainEventState, event);
umlDomainEventQueue(data->driver, event);
virHashRemoveEntry(data->driver->autodestroy, uuidstr); virHashRemoveEntry(data->driver->autodestroy, uuidstr);
return 0; return 0;
} }
@ -1615,8 +1608,7 @@ static virDomainPtr umlDomainCreateXML(virConnectPtr conn, const char *xml,
cleanup: cleanup:
virDomainDefFree(def); virDomainDefFree(def);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event) virObjectEventStateQueue(driver->domainEventState, event);
umlDomainEventQueue(driver, event);
umlDriverUnlock(driver); umlDriverUnlock(driver);
virNWFilterUnlockFilterUpdates(); virNWFilterUnlockFilterUpdates();
return dom; return dom;
@ -1689,8 +1681,7 @@ umlDomainDestroyFlags(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event) virObjectEventStateQueue(driver->domainEventState, event);
umlDomainEventQueue(driver, event);
umlDriverUnlock(driver); umlDriverUnlock(driver);
return ret; return ret;
} }
@ -1949,8 +1940,7 @@ static int umlDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (event) virObjectEventStateQueue(driver->domainEventState, event);
umlDomainEventQueue(driver, event);
umlDriverUnlock(driver); umlDriverUnlock(driver);
virNWFilterUnlockFilterUpdates(); virNWFilterUnlockFilterUpdates();
return ret; return ret;
@ -2587,13 +2577,6 @@ umlConnectDomainEventDeregisterAny(virConnectPtr conn,
} }
/* driver must be locked before calling */
static void umlDomainEventQueue(struct uml_driver *driver,
virObjectEventPtr event)
{
virObjectEventStateQueue(driver->domainEventState, event);
}
static int umlConnectListAllDomains(virConnectPtr conn, static int umlConnectListAllDomains(virConnectPtr conn,
virDomainPtr **domains, virDomainPtr **domains,
unsigned int flags) unsigned int flags)