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 qemuMonitorDomainDeviceDeletedCallback 

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 81db1e75b3
commit cc121412fc
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_monitor.h
View File

@ -238,10 +238,10 @@ typedef void (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon,
virDomainObj *vm,
qemuMonitorEventPanicInfo *info,
void *opaque);
typedef int (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon,
virDomainObj *vm,
const char *devAlias,
void *opaque);
typedef void (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon,
virDomainObj *vm,
const char *devAlias,
void *opaque);
typedef int (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *mon,
virDomainObj *vm,
const char *devAlias,

4
src/qemu/qemu_process.c
View File

@ -1297,7 +1297,7 @@ qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_UNUSED,
}
int
void
qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm,
const char *devAlias,
@ -1330,7 +1330,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED,
cleanup:
virObjectUnlock(vm);
return 0;
return;
error:
qemuProcessEventFree(processEvent);
goto cleanup;

8
src/qemu/qemu_processpriv.h
View File

@ -32,9 +32,9 @@
* This header file should never be used outside unit tests.
*/
int qemuProcessHandleDeviceDeleted(qemuMonitor *mon,
virDomainObj *vm,
const char *devAlias,
void *opaque);
void qemuProcessHandleDeviceDeleted(qemuMonitor *mon,
virDomainObj *vm,
const char *devAlias,
void *opaque);
int qemuProcessQMPInitMonitor(qemuMonitor *mon);