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

qemu: Remove return value from qemuMonitorDomainWatchdogCallback 

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 8ed88fe9a0
commit bd9a14cf6e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_monitor.h
View File

@ -179,7 +179,7 @@ typedef void (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
long long offset, long long offset,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
int action, int action,
void *opaque); void *opaque);

4
src/qemu/qemu_process.c
View File

@ -788,7 +788,7 @@ qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUSED,
} }
static int static void
qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
int action, int action,
@ -842,8 +842,6 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
virObjectUnlock(vm); virObjectUnlock(vm);
virObjectEventStateQueue(driver->domainEventState, watchdogEvent); virObjectEventStateQueue(driver->domainEventState, watchdogEvent);
virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
return 0;
} }