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

libxl: move libxlDomEventsRegister to libxl_domain

Browse Source 
Move libxlDomEventsRegister from libxl_driver to libxl_domain for
use by other libxl modules.  For consistency, rename to
libxlDomainEventsRegister.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2014-02-26 12:28:44 -07:00
parent a0407e63f8
commit ea88cc7683
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libxl/libxl_domain.c
View File

@ -732,3 +732,27 @@ libxlDomainCleanupJob(libxlDriverPrivatePtr driver,
return libxlDomainObjEndJob(driver, vm); return libxlDomainObjEndJob(driver, vm);
} }
/*
* Register for domain events emitted by libxl.
*/
int
libxlDomainEventsRegister(virDomainObjPtr vm)
{
libxlDomainObjPrivatePtr priv = vm->privateData;
libxl_event_register_callbacks(priv->ctx, &ev_hooks, vm);
/* Always enable domain death events */
if (libxl_evenable_domain_death(priv->ctx, vm->def->id, 0, &priv->deathW))
goto error;
return 0;
error:
if (priv->deathW) {
libxl_evdisable_domain_death(priv->ctx, priv->deathW);
priv->deathW = NULL;
}
return -1;
}

4
src/libxl/libxl_domain.h
View File

@ -75,7 +75,7 @@ struct _libxlDomainObjPrivate {
extern virDomainXMLPrivateDataCallbacks libxlDomainXMLPrivateDataCallbacks; extern virDomainXMLPrivateDataCallbacks libxlDomainXMLPrivateDataCallbacks;
extern virDomainDefParserConfig libxlDomainDefParserConfig; extern virDomainDefParserConfig libxlDomainDefParserConfig;
extern const struct libxl_event_hooks ev_hooks;
int int
libxlDomainObjPrivateInitCtx(virDomainObjPtr vm); libxlDomainObjPrivateInitCtx(virDomainObjPtr vm);
@ -116,5 +116,7 @@ bool
libxlDomainCleanupJob(libxlDriverPrivatePtr driver, libxlDomainCleanupJob(libxlDriverPrivatePtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainShutoffReason reason); virDomainShutoffReason reason);
int
libxlDomainEventsRegister(virDomainObjPtr vm);
#endif /* LIBXL_DOMAIN_H */ #endif /* LIBXL_DOMAIN_H */

30
src/libxl/libxl_driver.c
View File

@ -386,36 +386,12 @@ error:
libxl_event_free(priv->ctx, (libxl_event *)event); libxl_event_free(priv->ctx, (libxl_event *)event);
} }
static const struct libxl_event_hooks ev_hooks = { const struct libxl_event_hooks ev_hooks = {
.event_occurs_mask = LIBXL_EVENTMASK_ALL, .event_occurs_mask = LIBXL_EVENTMASK_ALL,
.event_occurs = libxlEventHandler, .event_occurs = libxlEventHandler,
.disaster = NULL, .disaster = NULL,
}; };
/*
* Register for domain events emitted by libxl.
*/
static int
libxlDomEventsRegister(virDomainObjPtr vm)
{
libxlDomainObjPrivatePtr priv = vm->privateData;
libxl_event_register_callbacks(priv->ctx, &ev_hooks, vm);
/* Always enable domain death events */
if (libxl_evenable_domain_death(priv->ctx, vm->def->id, 0, &priv->deathW))
goto error;
return 0;
error:
if (priv->deathW) {
libxl_evdisable_domain_death(priv->ctx, priv->deathW);
priv->deathW = NULL;
}
return -1;
}
static int static int
libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm)
{ {
@ -633,7 +609,7 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm,
* be cleaned up if there are any subsequent failures. * be cleaned up if there are any subsequent failures.
*/ */
vm->def->id = domid; vm->def->id = domid;
if (libxlDomEventsRegister(vm) < 0) if (libxlDomainEventsRegister(vm) < 0)
goto cleanup_dom; goto cleanup_dom;
if ((dom_xml = virDomainDefFormat(vm->def, 0)) == NULL) if ((dom_xml = virDomainDefFormat(vm->def, 0)) == NULL)
@ -741,7 +717,7 @@ libxlReconnectDomain(virDomainObjPtr vm,
driver->inhibitCallback(true, driver->inhibitOpaque); driver->inhibitCallback(true, driver->inhibitOpaque);
/* Re-register domain death et. al. events */ /* Re-register domain death et. al. events */
libxlDomEventsRegister(vm); libxlDomainEventsRegister(vm);
virObjectUnlock(vm); virObjectUnlock(vm);
return 0; return 0;