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

qemu: Remove return value from qemuMonitorDomainResumeCallback

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 0c6943861c..6afd1f0717 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -172,9 +172,9 @@ typedef void (*qemuMonitorDomainResetCallback)(qemuMonitor *mon,
 typedef void (*qemuMonitorDomainStopCallback)(qemuMonitor *mon,
                                               virDomainObj *vm,
                                               void *opaque);
-typedef int (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon,
-                                               virDomainObj *vm,
-                                               void *opaque);
+typedef void (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon,
+                                                virDomainObj *vm,
+                                                void *opaque);
 typedef int (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon,
                                                   virDomainObj *vm,
                                                   long long offset,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 99ad2df5e6..067eed3aa2 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -703,7 +703,7 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED,
                         virDomainObj *vm,
                         void *opaque)
@@ -743,7 +743,6 @@ qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED,
 
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-    return 0;
 }
 
 static int