External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 18:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove return value from qemuMonitorDomainResetCallback

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 40950f60fc
commit 8e95b76b1a
2 changed files with 4 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

@ -166,7 +166,7 @@ typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
virTristateBool guest, virTristateBool guest,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainResetCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainResetCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainStopCallback)(qemuMonitor *mon, typedef int (*qemuMonitorDomainStopCallback)(qemuMonitor *mon,

5
src/qemu/qemu_process.c
View File

@ -400,7 +400,7 @@ qemuProcessFindDomainDiskByAliasOrQOM(virDomainObj *vm,
} }
static int static void
qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
void *opaque) void *opaque)
@ -409,7 +409,6 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED,
virObjectEvent *event; virObjectEvent *event;
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
int ret = -1;
virObjectLock(vm); virObjectLock(vm);
@ -441,11 +440,9 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED,
qemuDomainObjEndJob(driver, vm); qemuDomainObjEndJob(driver, vm);
} }
ret = 0;
cleanup: cleanup:
virObjectUnlock(vm); virObjectUnlock(vm);
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
return ret;
} }