External/libvirt
1
0
Fork 0
Code

qemu: Remove return value from qemuMonitorDomainEventCallback

Browse Source 
Change the callback prototype and fix the callback registered in the
process code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-07-20 10:05:06 +02:00
parent 7a1b07925c
commit b2bf8d5bab
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_monitor.h
View File

@ -155,13 +155,13 @@ typedef void (*qemuMonitorEofNotifyCallback)(qemuMonitor *mon,
typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitor *mon, typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainEventCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *event, const char *event,
long long seconds, long long seconds,
unsigned int micros, unsigned int micros,
const char *details, const char *details,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon, typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
virTristateBool guest, virTristateBool guest,

4
src/qemu/qemu_process.c
View File

@ -546,7 +546,7 @@ qemuProcessShutdownOrReboot(virQEMUDriver *driver,
} }
static int static void
qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *eventName, const char *eventName,
@ -567,8 +567,6 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED,
virObjectUnlock(vm); virObjectUnlock(vm);
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
return 0;
} }