From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 20 Jul 2021 08:05:06 +0000 (+0200)
Subject: qemu: Remove return value from qemuMonitorDomainJobStatusChangeCallback
X-Git-Tag: v7.6.0-rc1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b69147c052e1ee9a2bf919a26c77c00f2c79a11;p=thirdparty%2Flibvirt.git

qemu: Remove return value from qemuMonitorDomainJobStatusChangeCallback

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>
---

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 483ad80126..5f25d821f6 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -210,11 +210,11 @@ typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon,
                                                   int status,
                                                   const char *error,
                                                   void *opaque);
-typedef int (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon,
-                                                        virDomainObj *vm,
-                                                        const char *jobname,
-                                                        int status,
-                                                        void *opaque);
+typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon,
+                                                         virDomainObj *vm,
+                                                         const char *jobname,
+                                                         int status,
+                                                         void *opaque);
 typedef int (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon,
                                                    virDomainObj *vm,
                                                    const char *devAlias,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 25b2543968..83260c902e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -977,7 +977,7 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNUC_UNUSED,
                                  virDomainObj *vm,
                                  const char *jobname,
@@ -1034,7 +1034,6 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNUC_UNUSED,
  cleanup:
     qemuProcessEventFree(processEvent);
     virObjectUnlock(vm);
-    return 0;
 }