External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Remove return value from qemuMonitorDomainPRManagerStatusChangedCallback

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 a55093ec28
commit 3b63871f2c
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_monitor.h
View File

@ -310,7 +310,7 @@ typedef void (*qemuMonitorDomainDumpCompletedCallback)(qemuMonitor *mon,
const char *error, const char *error,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *prManager, const char *prManager,
bool connected, bool connected,

11
src/qemu/qemu_process.c
View File

@ -1703,7 +1703,7 @@ qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNUC_UNUSED,
} }
static int static void
qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *prManager, const char *prManager,
@ -1714,24 +1714,21 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
struct qemuProcessEvent *processEvent = NULL; struct qemuProcessEvent *processEvent = NULL;
const char *managedAlias = qemuDomainGetManagedPRAlias(); const char *managedAlias = qemuDomainGetManagedPRAlias();
int ret = -1;
virObjectLock(vm); virObjectLock(vm);
VIR_DEBUG("pr-manager %s status changed for domain %p %s connected=%d", VIR_DEBUG("pr-manager %s status changed for domain %p %s connected=%d",
prManager, vm, vm->def->name, connected); prManager, vm, vm->def->name, connected);
if (connected) {
/* Connect events are boring. */ /* Connect events are boring. */
ret = 0; if (connected)
goto cleanup; goto cleanup;
}
/* Disconnect events are more interesting. */ /* Disconnect events are more interesting. */
if (STRNEQ(prManager, managedAlias)) { if (STRNEQ(prManager, managedAlias)) {
VIR_DEBUG("pr-manager %s not managed, ignoring event", VIR_DEBUG("pr-manager %s not managed, ignoring event",
prManager); prManager);
ret = 0;
goto cleanup; goto cleanup;
} }
@ -1749,10 +1746,8 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
goto cleanup; goto cleanup;
} }
ret = 0;
cleanup: cleanup:
virObjectUnlock(vm); virObjectUnlock(vm);
return ret;
} }