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 qemuMonitorDomainAcpiOstInfoCallback 

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 5e7d9542ec
commit a23f9ce576
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_monitor.h
View File

@ -267,7 +267,7 @@ typedef void (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon,
int pass, int pass,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *alias, const char *alias,
const char *slotType, const char *slotType,

4
src/qemu/qemu_process.c
View File

@ -1393,7 +1393,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED,
* Note that qemu does not emit the event for all the documented sources or * Note that qemu does not emit the event for all the documented sources or
* devices. * devices.
*/ */
static int static void
qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *alias, const char *alias,
@ -1428,8 +1428,6 @@ qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED,
cleanup: cleanup:
virObjectUnlock(vm); virObjectUnlock(vm);
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
return 0;
} }