External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 19:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed virDomainEventNew* to virDomainEventLifecycleNew*

Browse Source 
This aims at providing some consistency with other domain events
This commit is contained in:
Cédric Bosdonnat 2013-11-21 18:03:26 +01:00 committed by Daniel P. Berrange
parent 0d1d632d79
commit 6ffce0f698
15 changed files with 149 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/domain_event.c
View File

@ -790,7 +790,7 @@ static void *virDomainEventNewInternal(virClassPtr klass,
return event; return event;
} }
virDomainEventPtr virDomainEventNew(int id, const char *name, virDomainEventPtr virDomainEventLifecycleNew(int id, const char *name,
const unsigned char *uuid, const unsigned char *uuid,
int type, int detail) int type, int detail)
{ {
@ -810,19 +810,21 @@ virDomainEventPtr virDomainEventNew(int id, const char *name,
return (virDomainEventPtr)event; return (virDomainEventPtr)event;
} }
virDomainEventPtr virDomainEventNewFromDom(virDomainPtr dom, int type, int detail) virDomainEventPtr virDomainEventLifecycleNewFromDom(virDomainPtr dom, int type, int detail)
{ {
return virDomainEventNew(dom->id, dom->name, dom->uuid, type, detail); return virDomainEventLifecycleNew(dom->id, dom->name, dom->uuid,
type, detail);
} }
virDomainEventPtr virDomainEventNewFromObj(virDomainObjPtr obj, int type, int detail) virDomainEventPtr virDomainEventLifecycleNewFromObj(virDomainObjPtr obj, int type, int detail)
{ {
return virDomainEventNewFromDef(obj->def, type, detail); return virDomainEventLifecycleNewFromDef(obj->def, type, detail);
} }
virDomainEventPtr virDomainEventNewFromDef(virDomainDefPtr def, int type, int detail) virDomainEventPtr virDomainEventLifecycleNewFromDef(virDomainDefPtr def, int type, int detail)
{ {
return virDomainEventNew(def->id, def->name, def->uuid, type, detail); return virDomainEventLifecycleNew(def->id, def->name, def->uuid,
type, detail);
} }
virDomainEventPtr virDomainEventRebootNew(int id, const char *name, virDomainEventPtr virDomainEventRebootNew(int id, const char *name,

18
src/conf/domain_event.h
View File

@ -44,10 +44,20 @@ typedef virDomainEvent *virDomainEventPtr;
typedef struct _virObjectEventState virObjectEventState; typedef struct _virObjectEventState virObjectEventState;
typedef virObjectEventState *virObjectEventStatePtr; typedef virObjectEventState *virObjectEventStatePtr;
virDomainEventPtr virDomainEventNew(int id, const char *name, const unsigned char *uuid, int type, int detail); virDomainEventPtr virDomainEventLifecycleNew(int id,
virDomainEventPtr virDomainEventNewFromDom(virDomainPtr dom, int type, int detail); const char *name,
virDomainEventPtr virDomainEventNewFromObj(virDomainObjPtr obj, int type, int detail); const unsigned char *uuid,
virDomainEventPtr virDomainEventNewFromDef(virDomainDefPtr def, int type, int detail); int type,
int detail);
virDomainEventPtr virDomainEventLifecycleNewFromDom(virDomainPtr dom,
int type,
int detail);
virDomainEventPtr virDomainEventLifecycleNewFromObj(virDomainObjPtr obj,
int type,
int detail);
virDomainEventPtr virDomainEventLifecycleNewFromDef(virDomainDefPtr def,
int type,
int detail);
virDomainEventPtr virDomainEventRebootNew(int id, const char *name, const unsigned char *uuid); virDomainEventPtr virDomainEventRebootNew(int id, const char *name, const unsigned char *uuid);
virDomainEventPtr virDomainEventRebootNewFromDom(virDomainPtr dom); virDomainEventPtr virDomainEventRebootNewFromDom(virDomainPtr dom);

8
src/libvirt_private.syms
View File

@ -430,10 +430,10 @@ virDomainEventIOErrorNewFromDom;
virDomainEventIOErrorNewFromObj; virDomainEventIOErrorNewFromObj;
virDomainEventIOErrorReasonNewFromDom; virDomainEventIOErrorReasonNewFromDom;
virDomainEventIOErrorReasonNewFromObj; virDomainEventIOErrorReasonNewFromObj;
virDomainEventNew; virDomainEventLifecycleNew;
virDomainEventNewFromDef; virDomainEventLifecycleNewFromDef;
virDomainEventNewFromDom; virDomainEventLifecycleNewFromDom;
virDomainEventNewFromObj; virDomainEventLifecycleNewFromObj;
virDomainEventPMSuspendDiskNewFromDom; virDomainEventPMSuspendDiskNewFromDom;
virDomainEventPMSuspendDiskNewFromObj; virDomainEventPMSuspendDiskNewFromObj;
virDomainEventPMSuspendNewFromDom; virDomainEventPMSuspendNewFromDom;

18
src/libxl/libxl_driver.c
View File

@ -380,7 +380,7 @@ libxlEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event)
case LIBXL_SHUTDOWN_REASON_POWEROFF: case LIBXL_SHUTDOWN_REASON_POWEROFF:
case LIBXL_SHUTDOWN_REASON_CRASH: case LIBXL_SHUTDOWN_REASON_CRASH:
if (xl_reason == LIBXL_SHUTDOWN_REASON_CRASH) { if (xl_reason == LIBXL_SHUTDOWN_REASON_CRASH) {
dom_event = virDomainEventNewFromObj(vm, dom_event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_CRASHED); VIR_DOMAIN_EVENT_STOPPED_CRASHED);
reason = VIR_DOMAIN_SHUTOFF_CRASHED; reason = VIR_DOMAIN_SHUTOFF_CRASHED;
@ -675,7 +675,7 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm,
if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback) if (virAtomicIntInc(&driver->nactive) == 1 && driver->inhibitCallback)
driver->inhibitCallback(true, driver->inhibitOpaque); driver->inhibitCallback(true, driver->inhibitOpaque);
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED,
restore_fd < 0 ? restore_fd < 0 ?
VIR_DOMAIN_EVENT_STARTED_BOOTED : VIR_DOMAIN_EVENT_STARTED_BOOTED :
VIR_DOMAIN_EVENT_STARTED_RESTORED); VIR_DOMAIN_EVENT_STARTED_RESTORED);
@ -1324,7 +1324,7 @@ libxlDomainSuspend(virDomainPtr dom)
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER);
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
} }
@ -1377,7 +1377,7 @@ libxlDomainResume(virDomainPtr dom)
virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
VIR_DOMAIN_RUNNING_UNPAUSED); VIR_DOMAIN_RUNNING_UNPAUSED);
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
} }
@ -1501,7 +1501,7 @@ libxlDomainDestroyFlags(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED); VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED) != 0) { if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED) != 0) {
@ -1821,7 +1821,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm,
goto cleanup; goto cleanup;
} }
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_SAVED); VIR_DOMAIN_EVENT_STOPPED_SAVED);
if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED) != 0) { if (libxlVmReap(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED) != 0) {
@ -2009,7 +2009,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags)
goto cleanup_unpause; goto cleanup_unpause;
} }
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_CRASHED); VIR_DOMAIN_EVENT_STOPPED_CRASHED);
if (!vm->persistent) { if (!vm->persistent) {
virDomainObjListRemove(driver->domains, vm); virDomainObjListRemove(driver->domains, vm);
@ -2699,7 +2699,7 @@ libxlDomainDefineXML(virConnectPtr conn, const char *xml)
if (dom) if (dom)
dom->id = vm->def->id; dom->id = vm->def->id;
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED,
!oldDef ? !oldDef ?
VIR_DOMAIN_EVENT_DEFINED_ADDED : VIR_DOMAIN_EVENT_DEFINED_ADDED :
VIR_DOMAIN_EVENT_DEFINED_UPDATED); VIR_DOMAIN_EVENT_DEFINED_UPDATED);
@ -2766,7 +2766,7 @@ libxlDomainUndefineFlags(virDomainPtr dom,
if (virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm) < 0) if (virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm) < 0)
goto cleanup; goto cleanup;
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED,
VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
if (virDomainObjIsActive(vm)) { if (virDomainObjIsActive(vm)) {

16
src/lxc/lxc_driver.c
View File

@ -480,7 +480,7 @@ static virDomainPtr lxcDomainDefineXML(virConnectPtr conn, const char *xml)
goto cleanup; goto cleanup;
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
!oldDef ? !oldDef ?
VIR_DOMAIN_EVENT_DEFINED_ADDED : VIR_DOMAIN_EVENT_DEFINED_ADDED :
@ -530,7 +530,7 @@ static int lxcDomainUndefineFlags(virDomainPtr dom,
vm) < 0) vm) < 0)
goto cleanup; goto cleanup;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED,
VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
@ -932,7 +932,7 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom,
VIR_DOMAIN_RUNNING_BOOTED); VIR_DOMAIN_RUNNING_BOOTED);
if (ret == 0) { if (ret == 0) {
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
virDomainAuditStart(vm, "booted", true); virDomainAuditStart(vm, "booted", true);
@ -1040,7 +1040,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
virDomainAuditStart(vm, "booted", true); virDomainAuditStart(vm, "booted", true);
@ -1288,7 +1288,7 @@ lxcDomainDestroyFlags(virDomainPtr dom,
priv = vm->privateData; priv = vm->privateData;
ret = virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); ret = virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED); VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
priv->doneStopEvent = true; priv->doneStopEvent = true;
@ -1482,7 +1482,7 @@ static void lxcNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
if (newVM) { if (newVM) {
virDomainEventPtr event = virDomainEventPtr event =
virDomainEventNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
VIR_DOMAIN_EVENT_DEFINED_ADDED); VIR_DOMAIN_EVENT_DEFINED_ADDED);
if (event) if (event)
@ -2361,7 +2361,7 @@ static int lxcDomainSuspend(virDomainPtr dom)
} }
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
} }
@ -2411,7 +2411,7 @@ static int lxcDomainResume(virDomainPtr dom)
virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
VIR_DOMAIN_RUNNING_UNPAUSED); VIR_DOMAIN_RUNNING_UNPAUSED);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
} }

8
src/lxc/lxc_process.c
View File

@ -71,7 +71,7 @@ lxcProcessAutoDestroy(virDomainObjPtr dom,
VIR_DEBUG("Killing domain"); VIR_DEBUG("Killing domain");
virLXCProcessStop(driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED); virLXCProcessStop(driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED);
virDomainAuditStop(dom, "destroyed"); virDomainAuditStop(dom, "destroyed");
event = virDomainEventNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED); VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
priv->doneStopEvent = true; priv->doneStopEvent = true;
@ -502,7 +502,7 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon,
if (!priv->wantReboot) { if (!priv->wantReboot) {
virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN);
if (!priv->doneStopEvent) { if (!priv->doneStopEvent) {
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
priv->stopReason); priv->stopReason);
virDomainAuditStop(vm, "shutdown"); virDomainAuditStop(vm, "shutdown");
@ -520,7 +520,7 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon,
if (ret == 0) { if (ret == 0) {
event = virDomainEventRebootNewFromObj(vm); event = virDomainEventRebootNewFromObj(vm);
} else { } else {
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
priv->stopReason); priv->stopReason);
if (!vm->persistent) { if (!vm->persistent) {
@ -1395,7 +1395,7 @@ virLXCProcessAutostartDomain(virDomainObjPtr vm,
err ? err->message : ""); err ? err->message : "");
} else { } else {
virDomainEventPtr event = virDomainEventPtr event =
virDomainEventNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
if (event) if (event)

66
src/qemu/qemu_driver.c
View File

@ -879,7 +879,7 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
if (newVM) { if (newVM) {
virDomainEventPtr event = virDomainEventPtr event =
virDomainEventNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
VIR_DOMAIN_EVENT_DEFINED_ADDED); VIR_DOMAIN_EVENT_DEFINED_ADDED);
if (event) if (event)
@ -1627,7 +1627,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
if (event && (flags & VIR_DOMAIN_START_PAUSED)) { if (event && (flags & VIR_DOMAIN_START_PAUSED)) {
@ -1636,7 +1636,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
* no matter what, but don't care about suspend events), and * no matter what, but don't care about suspend events), and
* those that also care about running/paused. To satisfy both * those that also care about running/paused. To satisfy both
* client types, we have to send two events. */ * client types, we have to send two events. */
event2 = virDomainEventNewFromObj(vm, event2 = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
} }
@ -1721,7 +1721,7 @@ static int qemuDomainSuspend(virDomainPtr dom) {
} }
if (eventDetail >= 0) { if (eventDetail >= 0) {
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
eventDetail); eventDetail);
} }
@ -1785,7 +1785,7 @@ static int qemuDomainResume(virDomainPtr dom) {
"%s", _("resume operation failed")); "%s", _("resume operation failed"));
goto endjob; goto endjob;
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
} }
@ -2124,7 +2124,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
} }
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED, 0); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED, 0);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED); VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
virDomainAuditStop(vm, "destroyed"); virDomainAuditStop(vm, "destroyed");
@ -3107,7 +3107,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom,
/* Shut it down */ /* Shut it down */
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED, 0); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED, 0);
virDomainAuditStop(vm, "saved"); virDomainAuditStop(vm, "saved");
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_SAVED); VIR_DOMAIN_EVENT_STOPPED_SAVED);
if (!vm->persistent) { if (!vm->persistent) {
@ -3125,7 +3125,7 @@ endjob:
QEMU_ASYNC_JOB_SAVE); QEMU_ASYNC_JOB_SAVE);
if (rc < 0) { if (rc < 0) {
VIR_WARN("Unable to resume guest CPUs after save failure"); VIR_WARN("Unable to resume guest CPUs after save failure");
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR); VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
} }
@ -3568,7 +3568,7 @@ endjob:
if ((ret == 0) && (flags & VIR_DUMP_CRASH)) { if ((ret == 0) && (flags & VIR_DUMP_CRASH)) {
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, 0); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, 0);
virDomainAuditStop(vm, "crashed"); virDomainAuditStop(vm, "crashed");
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_CRASHED); VIR_DOMAIN_EVENT_STOPPED_CRASHED);
} }
@ -3588,7 +3588,7 @@ endjob:
if (resume && qemuProcessStartCPUs(driver, vm, dom->conn, if (resume && qemuProcessStartCPUs(driver, vm, dom->conn,
VIR_DOMAIN_RUNNING_UNPAUSED, VIR_DOMAIN_RUNNING_UNPAUSED,
QEMU_ASYNC_JOB_DUMP) < 0) { QEMU_ASYNC_JOB_DUMP) < 0) {
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR); VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
if (virGetLastError() == NULL) if (virGetLastError() == NULL)
@ -3835,7 +3835,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver,
VIR_DOMAIN_CRASHED, VIR_DOMAIN_CRASHED,
VIR_DOMAIN_CRASHED_PANICKED); VIR_DOMAIN_CRASHED_PANICKED);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_CRASHED, VIR_DOMAIN_EVENT_CRASHED,
VIR_DOMAIN_EVENT_CRASHED_PANICKED); VIR_DOMAIN_EVENT_CRASHED_PANICKED);
@ -3875,7 +3875,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver,
} }
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, 0); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, 0);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_CRASHED); VIR_DOMAIN_EVENT_STOPPED_CRASHED);
@ -5402,7 +5402,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_RESTORED); VIR_DOMAIN_EVENT_STARTED_RESTORED);
virDomainAuditStart(vm, "restored", true); virDomainAuditStart(vm, "restored", true);
@ -5427,7 +5427,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
} else { } else {
int detail = (start_paused ? VIR_DOMAIN_EVENT_SUSPENDED_PAUSED : int detail = (start_paused ? VIR_DOMAIN_EVENT_SUSPENDED_PAUSED :
VIR_DOMAIN_EVENT_SUSPENDED_RESTORED); VIR_DOMAIN_EVENT_SUSPENDED_RESTORED);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
detail); detail);
if (event) if (event)
@ -6067,13 +6067,13 @@ qemuDomainObjStart(virConnectPtr conn,
virDomainAuditStart(vm, "booted", ret >= 0); virDomainAuditStart(vm, "booted", ret >= 0);
if (ret >= 0) { if (ret >= 0) {
virDomainEventPtr event = virDomainEventPtr event =
virDomainEventNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
if (event) { if (event) {
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
if (start_paused) { if (start_paused) {
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
if (event) if (event)
@ -6205,7 +6205,7 @@ static virDomainPtr qemuDomainDefineXML(virConnectPtr conn, const char *xml) {
goto cleanup; goto cleanup;
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
!oldDef ? !oldDef ?
VIR_DOMAIN_EVENT_DEFINED_ADDED : VIR_DOMAIN_EVENT_DEFINED_ADDED :
@ -6293,7 +6293,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
if (virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm) < 0) if (virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm) < 0)
goto cleanup; goto cleanup;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED,
VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
@ -11778,7 +11778,7 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn,
goto cleanup; goto cleanup;
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) { if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) {
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT);
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, 0); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, 0);
virDomainAuditStop(vm, "from-snapshot"); virDomainAuditStop(vm, "from-snapshot");
@ -11794,7 +11794,7 @@ cleanup:
qemuProcessStartCPUs(driver, vm, conn, qemuProcessStartCPUs(driver, vm, conn,
VIR_DOMAIN_RUNNING_UNPAUSED, VIR_DOMAIN_RUNNING_UNPAUSED,
QEMU_ASYNC_JOB_NONE) < 0) { QEMU_ASYNC_JOB_NONE) < 0) {
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR); VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
if (virGetLastError() == NULL) { if (virGetLastError() == NULL) {
@ -12533,7 +12533,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) { if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) {
virDomainEventPtr event; virDomainEventPtr event;
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT);
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, 0); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, 0);
virDomainAuditStop(vm, "from-snapshot"); virDomainAuditStop(vm, "from-snapshot");
@ -12553,7 +12553,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
VIR_DOMAIN_PAUSED_FROM_SNAPSHOT); VIR_DOMAIN_PAUSED_FROM_SNAPSHOT);
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT);
if (event) if (event)
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
@ -12567,7 +12567,7 @@ endjob:
VIR_DOMAIN_RUNNING_UNPAUSED, VIR_DOMAIN_RUNNING_UNPAUSED,
QEMU_ASYNC_JOB_SNAPSHOT) < 0) { QEMU_ASYNC_JOB_SNAPSHOT) < 0) {
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR); VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
if (event) if (event)
@ -13364,7 +13364,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, 0); VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, 0);
virDomainAuditStop(vm, "from-snapshot"); virDomainAuditStop(vm, "from-snapshot");
detail = VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT; detail = VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
detail); detail);
if (event) if (event)
@ -13384,7 +13384,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
* that user will be alerted that they are now paused. * that user will be alerted that they are now paused.
* If restore later succeeds, we might replace this. */ * If restore later succeeds, we might replace this. */
detail = VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT; detail = VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
detail); detail);
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
@ -13416,7 +13416,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
VIR_QEMU_PROCESS_START_PAUSED); VIR_QEMU_PROCESS_START_PAUSED);
virDomainAuditStart(vm, "from-snapshot", rc >= 0); virDomainAuditStart(vm, "from-snapshot", rc >= 0);
detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
detail); detail);
if (rc < 0) if (rc < 0)
@ -13433,7 +13433,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
if (was_stopped) { if (was_stopped) {
/* Transition 3, use event as-is and add event2 */ /* Transition 3, use event as-is and add event2 */
detail = VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT; detail = VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT;
event2 = virDomainEventNewFromObj(vm, event2 = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
detail); detail);
} /* else transition 6 and 9 use event as-is */ } /* else transition 6 and 9 use event as-is */
@ -13454,13 +13454,13 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
if (was_stopped) { if (was_stopped) {
/* Transition 2 */ /* Transition 2 */
detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
detail); detail);
} else if (was_running) { } else if (was_running) {
/* Transition 8 */ /* Transition 8 */
detail = VIR_DOMAIN_EVENT_RESUMED; detail = VIR_DOMAIN_EVENT_RESUMED;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
detail); detail);
} }
@ -13477,7 +13477,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, 0); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, 0);
virDomainAuditStop(vm, "from-snapshot"); virDomainAuditStop(vm, "from-snapshot");
detail = VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT; detail = VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
detail); detail);
} }
@ -13519,12 +13519,12 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
goto endjob; goto endjob;
} }
detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
detail); detail);
if (paused) { if (paused) {
detail = VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT; detail = VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT;
event2 = virDomainEventNewFromObj(vm, event2 = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
detail); detail);
} }
@ -14184,7 +14184,7 @@ cleanup:
VIR_DOMAIN_RUNNING_UNPAUSED, VIR_DOMAIN_RUNNING_UNPAUSED,
QEMU_ASYNC_JOB_NONE) < 0) { QEMU_ASYNC_JOB_NONE) < 0) {
virDomainEventPtr event = NULL; virDomainEventPtr event = NULL;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR); VIR_DOMAIN_EVENT_SUSPENDED_API_ERROR);
if (event) if (event)

26
src/qemu/qemu_migration.c
View File

@ -1513,7 +1513,7 @@ qemuMigrationSetOffline(virQEMUDriverPtr driver,
if (ret == 0) { if (ret == 0) {
virDomainEventPtr event; virDomainEventPtr event;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED);
if (event) if (event)
@ -2422,7 +2422,7 @@ done:
if (!(flags & VIR_MIGRATE_OFFLINE)) { if (!(flags & VIR_MIGRATE_OFFLINE)) {
virDomainAuditStart(vm, "migrated", true); virDomainAuditStart(vm, "migrated", true);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_MIGRATED); VIR_DOMAIN_EVENT_STARTED_MIGRATED);
} }
@ -2736,7 +2736,7 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver,
VIR_QEMU_PROCESS_STOP_MIGRATED); VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(vm, "migrated"); virDomainAuditStop(vm, "migrated");
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_MIGRATED); VIR_DOMAIN_EVENT_STOPPED_MIGRATED);
} else { } else {
@ -2757,7 +2757,7 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_MIGRATED); VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) { if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) {
@ -4100,7 +4100,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver,
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED, qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED,
VIR_QEMU_PROCESS_STOP_MIGRATED); VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(vm, "migrated"); virDomainAuditStop(vm, "migrated");
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_MIGRATED); VIR_DOMAIN_EVENT_STOPPED_MIGRATED);
} }
@ -4123,7 +4123,7 @@ endjob:
vm->def->name); vm->def->name);
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_MIGRATED); VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
} }
@ -4205,7 +4205,7 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver,
vm->def->name); vm->def->name);
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_MIGRATED); VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
} }
@ -4418,7 +4418,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
VIR_QEMU_PROCESS_STOP_MIGRATED); VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(vm, "failed"); virDomainAuditStop(vm, "failed");
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FAILED); VIR_DOMAIN_EVENT_STOPPED_FAILED);
goto endjob; goto endjob;
@ -4469,7 +4469,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
goto endjob; goto endjob;
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
newVM ? newVM ?
VIR_DOMAIN_EVENT_DEFINED_ADDED : VIR_DOMAIN_EVENT_DEFINED_ADDED :
@ -4507,7 +4507,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
VIR_QEMU_PROCESS_STOP_MIGRATED); VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(vm, "failed"); virDomainAuditStop(vm, "failed");
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FAILED); VIR_DOMAIN_EVENT_STOPPED_FAILED);
} }
@ -4518,7 +4518,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); dom = virGetDomain(dconn, vm->def->name, vm->def->uuid);
if (!(flags & VIR_MIGRATE_OFFLINE)) { if (!(flags & VIR_MIGRATE_OFFLINE)) {
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_MIGRATED); VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) {
@ -4526,7 +4526,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
VIR_DOMAIN_PAUSED_USER); VIR_DOMAIN_PAUSED_USER);
if (event) if (event)
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
} }
@ -4544,7 +4544,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED,
VIR_QEMU_PROCESS_STOP_MIGRATED); VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(vm, "failed"); virDomainAuditStop(vm, "failed");
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FAILED); VIR_DOMAIN_EVENT_STOPPED_FAILED);
} }

22
src/qemu/qemu_process.c
View File

@ -316,7 +316,7 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
auditReason = "failed"; auditReason = "failed";
} }
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
eventReason); eventReason);
qemuProcessStop(driver, vm, stopReason, 0); qemuProcessStop(driver, vm, stopReason, 0);
@ -589,7 +589,7 @@ qemuProcessFakeReboot(void *opaque)
goto endjob; goto endjob;
} }
priv->gotShutdown = false; priv->gotShutdown = false;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
@ -672,7 +672,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjSetState(vm, virDomainObjSetState(vm,
VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN,
VIR_DOMAIN_SHUTDOWN_UNKNOWN); VIR_DOMAIN_SHUTDOWN_UNKNOWN);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SHUTDOWN, VIR_DOMAIN_EVENT_SHUTDOWN,
VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED);
@ -718,7 +718,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
vm->def->name); vm->def->name);
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN); virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
@ -766,7 +766,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
VIR_DOMAIN_RUNNING_UNPAUSED); VIR_DOMAIN_RUNNING_UNPAUSED);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
@ -857,7 +857,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
VIR_DEBUG("Transitioned guest %s to paused state due to watchdog", vm->def->name); VIR_DEBUG("Transitioned guest %s to paused state due to watchdog", vm->def->name);
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_WATCHDOG); virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_WATCHDOG);
lifecycleEvent = virDomainEventNewFromObj(vm, lifecycleEvent = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_WATCHDOG); VIR_DOMAIN_EVENT_SUSPENDED_WATCHDOG);
@ -939,7 +939,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
VIR_DEBUG("Transitioned guest %s to paused state due to IO error", vm->def->name); VIR_DEBUG("Transitioned guest %s to paused state due to IO error", vm->def->name);
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_IOERROR); virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_IOERROR);
lifecycleEvent = virDomainEventNewFromObj(vm, lifecycleEvent = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_IOERROR); VIR_DOMAIN_EVENT_SUSPENDED_IOERROR);
@ -1156,7 +1156,7 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
VIR_DOMAIN_RUNNING_WAKEUP); VIR_DOMAIN_RUNNING_WAKEUP);
lifecycleEvent = virDomainEventNewFromObj(vm, lifecycleEvent = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_WAKEUP); VIR_DOMAIN_EVENT_STARTED_WAKEUP);
@ -1196,7 +1196,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjSetState(vm, VIR_DOMAIN_PMSUSPENDED, virDomainObjSetState(vm, VIR_DOMAIN_PMSUSPENDED,
VIR_DOMAIN_PMSUSPENDED_UNKNOWN); VIR_DOMAIN_PMSUSPENDED_UNKNOWN);
lifecycleEvent = lifecycleEvent =
virDomainEventNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_PMSUSPENDED, VIR_DOMAIN_EVENT_PMSUSPENDED,
VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY); VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY);
@ -1268,7 +1268,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjSetState(vm, VIR_DOMAIN_PMSUSPENDED, virDomainObjSetState(vm, VIR_DOMAIN_PMSUSPENDED,
VIR_DOMAIN_PMSUSPENDED_UNKNOWN); VIR_DOMAIN_PMSUSPENDED_UNKNOWN);
lifecycleEvent = lifecycleEvent =
virDomainEventNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_PMSUSPENDED, VIR_DOMAIN_EVENT_PMSUSPENDED,
VIR_DOMAIN_EVENT_PMSUSPENDED_DISK); VIR_DOMAIN_EVENT_PMSUSPENDED_DISK);
@ -4648,7 +4648,7 @@ qemuProcessAutoDestroy(virDomainObjPtr dom,
VIR_QEMU_PROCESS_STOP_MIGRATED); VIR_QEMU_PROCESS_STOP_MIGRATED);
virDomainAuditStop(dom, "destroyed"); virDomainAuditStop(dom, "destroyed");
event = virDomainEventNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED); VIR_DOMAIN_EVENT_STOPPED_DESTROYED);

2
src/remote/remote_driver.c
View File

@ -4386,7 +4386,7 @@ remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
if (!dom) if (!dom)
return; return;
event = virDomainEventNewFromDom(dom, msg->event, msg->detail); event = virDomainEventLifecycleNewFromDom(dom, msg->event, msg->detail);
virDomainFree(dom); virDomainFree(dom);
remoteDomainEventQueue(priv, event); remoteDomainEventQueue(priv, event);

46
src/test/test_driver.c
View File

@ -1638,7 +1638,7 @@ testDomainCreateXML(virConnectPtr conn, const char *xml,
if (testDomainStartState(privconn, dom, VIR_DOMAIN_RUNNING_BOOTED) < 0) if (testDomainStartState(privconn, dom, VIR_DOMAIN_RUNNING_BOOTED) < 0)
goto cleanup; goto cleanup;
event = virDomainEventNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
@ -1766,7 +1766,7 @@ static int testDomainDestroy(virDomainPtr domain)
} }
testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_DESTROYED); testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_DESTROYED);
event = virDomainEventNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED); VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
@ -1811,7 +1811,7 @@ static int testDomainResume(virDomainPtr domain)
virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING, virDomainObjSetState(privdom, VIR_DOMAIN_RUNNING,
VIR_DOMAIN_RUNNING_UNPAUSED); VIR_DOMAIN_RUNNING_UNPAUSED);
event = virDomainEventNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
ret = 0; ret = 0;
@ -1853,7 +1853,7 @@ static int testDomainSuspend(virDomainPtr domain)
} }
virDomainObjSetState(privdom, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); virDomainObjSetState(privdom, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER);
event = virDomainEventNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_DOMAIN_EVENT_SUSPENDED_PAUSED);
ret = 0; ret = 0;
@ -1896,7 +1896,7 @@ static int testDomainShutdownFlags(virDomainPtr domain,
} }
testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN);
event = virDomainEventNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN);
@ -1971,7 +1971,7 @@ static int testDomainReboot(virDomainPtr domain,
if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) { if (virDomainObjGetState(privdom, NULL) == VIR_DOMAIN_SHUTOFF) {
testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SHUTDOWN);
event = virDomainEventNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN);
@ -2135,7 +2135,7 @@ testDomainSaveFlags(virDomainPtr domain, const char *path,
fd = -1; fd = -1;
testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SAVED); testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_SAVED);
event = virDomainEventNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_SAVED); VIR_DOMAIN_EVENT_STOPPED_SAVED);
@ -2253,7 +2253,7 @@ testDomainRestoreFlags(virConnectPtr conn,
if (testDomainStartState(privconn, dom, VIR_DOMAIN_RUNNING_RESTORED) < 0) if (testDomainStartState(privconn, dom, VIR_DOMAIN_RUNNING_RESTORED) < 0)
goto cleanup; goto cleanup;
event = virDomainEventNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_RESTORED); VIR_DOMAIN_EVENT_STARTED_RESTORED);
ret = 0; ret = 0;
@ -2319,7 +2319,7 @@ static int testDomainCoreDump(virDomainPtr domain,
if (flags & VIR_DUMP_CRASH) { if (flags & VIR_DUMP_CRASH) {
testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_CRASHED); testDomainShutdownState(domain, privdom, VIR_DOMAIN_SHUTOFF_CRASHED);
event = virDomainEventNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_CRASHED); VIR_DOMAIN_EVENT_STOPPED_CRASHED);
if (!privdom->persistent) { if (!privdom->persistent) {
@ -2803,7 +2803,7 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn,
def = NULL; def = NULL;
dom->persistent = 1; dom->persistent = 1;
event = virDomainEventNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
!oldDef ? !oldDef ?
VIR_DOMAIN_EVENT_DEFINED_ADDED : VIR_DOMAIN_EVENT_DEFINED_ADDED :
@ -2946,7 +2946,7 @@ static int testDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) {
goto cleanup; goto cleanup;
domain->id = privdom->def->id; domain->id = privdom->def->id;
event = virDomainEventNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
ret = 0; ret = 0;
@ -3011,7 +3011,7 @@ static int testDomainUndefineFlags(virDomainPtr domain,
* behavior here. */ * behavior here. */
} }
event = virDomainEventNewFromObj(privdom, event = virDomainEventLifecycleNewFromObj(privdom,
VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED,
VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
privdom->hasManagedSave = false; privdom->hasManagedSave = false;
@ -6180,7 +6180,7 @@ testDomainManagedSave(virDomainPtr dom, unsigned int flags)
} }
testDomainShutdownState(dom, vm, VIR_DOMAIN_SHUTOFF_SAVED); testDomainShutdownState(dom, vm, VIR_DOMAIN_SHUTOFF_SAVED);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_SAVED); VIR_DOMAIN_EVENT_STOPPED_SAVED);
vm->hasManagedSave = true; vm->hasManagedSave = true;
@ -6719,7 +6719,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain,
virDomainObjIsActive(vm)) { virDomainObjIsActive(vm)) {
testDomainShutdownState(domain, vm, testDomainShutdownState(domain, vm,
VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT); VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT);
event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT);
} }
} }
@ -6985,7 +6985,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
virResetError(err); virResetError(err);
testDomainShutdownState(snapshot->domain, vm, testDomainShutdownState(snapshot->domain, vm,
VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT); VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT);
if (event) if (event)
@ -7001,7 +7001,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
/* Create an event now in case the restore fails, so /* Create an event now in case the restore fails, so
* that user will be alerted that they are now paused. * that user will be alerted that they are now paused.
* If restore later succeeds, we might replace this. */ * If restore later succeeds, we might replace this. */
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT);
} }
@ -7015,7 +7015,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
if (testDomainStartState(privconn, vm, if (testDomainStartState(privconn, vm,
VIR_DOMAIN_RUNNING_FROM_SNAPSHOT) < 0) VIR_DOMAIN_RUNNING_FROM_SNAPSHOT) < 0)
goto cleanup; goto cleanup;
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT);
} }
@ -7029,7 +7029,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
VIR_DOMAIN_PAUSED_FROM_SNAPSHOT); VIR_DOMAIN_PAUSED_FROM_SNAPSHOT);
if (was_stopped) { if (was_stopped) {
/* Transition 3, use event as-is and add event2 */ /* Transition 3, use event as-is and add event2 */
event2 = virDomainEventNewFromObj(vm, event2 = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT);
} /* else transition 6 and 9 use event as-is */ } /* else transition 6 and 9 use event as-is */
@ -7040,12 +7040,12 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
if (was_stopped) { if (was_stopped) {
/* Transition 2 */ /* Transition 2 */
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT);
} else if (was_running) { } else if (was_running) {
/* Transition 8 */ /* Transition 8 */
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED); VIR_DOMAIN_EVENT_RESUMED);
} }
@ -7058,7 +7058,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
/* Transitions 4, 7 */ /* Transitions 4, 7 */
testDomainShutdownState(snapshot->domain, vm, testDomainShutdownState(snapshot->domain, vm,
VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT); VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT);
} }
@ -7070,11 +7070,11 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
if (event) if (event)
testDomainEventQueue(privconn, event); testDomainEventQueue(privconn, event);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT);
if (paused) { if (paused) {
event2 = virDomainEventNewFromObj(vm, event2 = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED,
VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT); VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT);
} }

18
src/uml/uml_driver.c
View File

@ -195,7 +195,7 @@ umlAutostartDomain(virDomainObjPtr vm,
vm->def->name, err ? err->message : _("unknown error")); vm->def->name, err ? err->message : _("unknown error"));
} else { } else {
virDomainEventPtr event = virDomainEventPtr event =
virDomainEventNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
if (event) if (event)
@ -347,7 +347,7 @@ reread:
umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN);
virDomainAuditStop(dom, "shutdown"); virDomainAuditStop(dom, "shutdown");
event = virDomainEventNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN);
if (!dom->persistent) { if (!dom->persistent) {
@ -381,7 +381,7 @@ reread:
umlShutdownVMDaemon(driver, dom, umlShutdownVMDaemon(driver, dom,
VIR_DOMAIN_SHUTOFF_FAILED); VIR_DOMAIN_SHUTOFF_FAILED);
virDomainAuditStop(dom, "failed"); virDomainAuditStop(dom, "failed");
event = virDomainEventNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FAILED); VIR_DOMAIN_EVENT_STOPPED_FAILED);
if (!dom->persistent) { if (!dom->persistent) {
@ -394,7 +394,7 @@ reread:
umlShutdownVMDaemon(driver, dom, umlShutdownVMDaemon(driver, dom,
VIR_DOMAIN_SHUTOFF_FAILED); VIR_DOMAIN_SHUTOFF_FAILED);
virDomainAuditStop(dom, "failed"); virDomainAuditStop(dom, "failed");
event = virDomainEventNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_FAILED); VIR_DOMAIN_EVENT_STOPPED_FAILED);
if (!dom->persistent) { if (!dom->persistent) {
@ -605,7 +605,7 @@ static void umlNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
if (newVM) { if (newVM) {
virDomainEventPtr event = virDomainEventPtr event =
virDomainEventNewFromObj(vm, virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
VIR_DOMAIN_EVENT_DEFINED_ADDED); VIR_DOMAIN_EVENT_DEFINED_ADDED);
if (event) if (event)
@ -737,7 +737,7 @@ static void umlProcessAutoDestroyDom(void *payload,
VIR_DEBUG("Killing domain"); VIR_DEBUG("Killing domain");
umlShutdownVMDaemon(data->driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED); umlShutdownVMDaemon(data->driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED);
virDomainAuditStop(dom, "destroyed"); virDomainAuditStop(dom, "destroyed");
event = virDomainEventNewFromObj(dom, event = virDomainEventLifecycleNewFromObj(dom,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED); VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
@ -1600,7 +1600,7 @@ static virDomainPtr umlDomainCreateXML(virConnectPtr conn, const char *xml,
goto cleanup; goto cleanup;
} }
virDomainAuditStart(vm, "booted", true); virDomainAuditStart(vm, "booted", true);
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
@ -1685,7 +1685,7 @@ umlDomainDestroyFlags(virDomainPtr dom,
umlShutdownVMDaemon(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); umlShutdownVMDaemon(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED);
virDomainAuditStop(vm, "destroyed"); virDomainAuditStop(vm, "destroyed");
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_DESTROYED); VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
if (!vm->persistent) { if (!vm->persistent) {
@ -2014,7 +2014,7 @@ static int umlDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) {
(flags & VIR_DOMAIN_START_AUTODESTROY)); (flags & VIR_DOMAIN_START_AUTODESTROY));
virDomainAuditStart(vm, "booted", ret >= 0); virDomainAuditStart(vm, "booted", ret >= 0);
if (ret == 0) if (ret == 0)
event = virDomainEventNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);

4
src/vbox/vbox_tmpl.c
View File

@ -6996,7 +6996,7 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
detail = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; detail = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN;
} }
ev = virDomainEventNewFromDom(dom, event, detail); ev = virDomainEventLifecycleNewFromDom(dom, event, detail);
if (ev) if (ev)
virObjectEventStateQueue(g_pVBoxGlobalData->domainEvents, ev); virObjectEventStateQueue(g_pVBoxGlobalData->domainEvents, ev);
@ -7100,7 +7100,7 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED,
detail = VIR_DOMAIN_EVENT_UNDEFINED_REMOVED; detail = VIR_DOMAIN_EVENT_UNDEFINED_REMOVED;
} }
ev = virDomainEventNewFromDom(dom, event, detail); ev = virDomainEventLifecycleNewFromDom(dom, event, detail);
if (ev) if (ev)
virObjectEventStateQueue(g_pVBoxGlobalData->domainEvents, ev); virObjectEventStateQueue(g_pVBoxGlobalData->domainEvents, ev);

2
src/xen/xen_inotify.c
View File

@ -148,7 +148,7 @@ xenInotifyDomainEventFromFile(virConnectPtr conn,
if (xenInotifyDomainLookup(conn, filename, &name, uuid) < 0) if (xenInotifyDomainLookup(conn, filename, &name, uuid) < 0)
return NULL; return NULL;
event = virDomainEventNew(-1, name, uuid, type, detail); event = virDomainEventLifecycleNew(-1, name, uuid, type, detail);
VIR_FREE(name); VIR_FREE(name);
return event; return event;
} }

16
src/xen/xs_internal.c
View File

@ -849,9 +849,9 @@ retry:
continue; continue;
} }
event = virDomainEventNew(new_domids[i], name, uuid, event = virDomainEventLifecycleNew(new_domids[i], name, uuid,
VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED,
VIR_DOMAIN_EVENT_STARTED_BOOTED); VIR_DOMAIN_EVENT_STARTED_BOOTED);
if (event) if (event)
xenUnifiedDomainEventDispatch(priv, event); xenUnifiedDomainEventDispatch(priv, event);
@ -919,11 +919,11 @@ retry:
if (!found) { if (!found) {
virDomainEventPtr event = virDomainEventPtr event =
virDomainEventNew(-1, virDomainEventLifecycleNew(-1,
priv->activeDomainList->doms[j]->name, priv->activeDomainList->doms[j]->name,
priv->activeDomainList->doms[j]->uuid, priv->activeDomainList->doms[j]->uuid,
VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED,
VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN);
if (event) if (event)
xenUnifiedDomainEventDispatch(priv, event); xenUnifiedDomainEventDispatch(priv, event);