External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove return value from qemuMonitorDomainBlockJobCallback

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

14
src/qemu/qemu_monitor.h
View File

@ -203,13 +203,13 @@ typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon,
const char *x509dname, const char *x509dname,
const char *saslUsername, const char *saslUsername,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *diskAlias, const char *diskAlias,
int type, int type,
int status, int status,
const char *error, const char *error,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon, typedef int (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *jobname, const char *jobname,

3
src/qemu/qemu_process.c
View File

@ -914,7 +914,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
} }
static int static void
qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *diskAlias, const char *diskAlias,
@ -974,7 +974,6 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED,
cleanup: cleanup:
qemuProcessEventFree(processEvent); qemuProcessEventFree(processEvent);
virObjectUnlock(vm); virObjectUnlock(vm);
return 0;
} }