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

qemu: Remove return value from qemuMonitorDomainPMSuspendDiskCallback

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 4efec27d6d..2f35171858 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -231,9 +231,9 @@ typedef void (*qemuMonitorDomainBalloonChangeCallback)(qemuMonitor *mon,
                                                        virDomainObj *vm,
                                                        unsigned long long actual,
                                                        void *opaque);
-typedef int (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon,
-                                                      virDomainObj *vm,
-                                                      void *opaque);
+typedef void (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon,
+                                                       virDomainObj *vm,
+                                                       void *opaque);
 typedef int (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon,
                                                    virDomainObj *vm,
                                                    qemuMonitorEventPanicInfo *info,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1d35bda649..26244ecd3d 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1227,7 +1227,7 @@ qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectEventStateQueue(driver->domainEventState, event);
 }
 
-static int
+static void
 qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNUC_UNUSED,
                                virDomainObj *vm,
                                void *opaque)
@@ -1265,8 +1265,6 @@ qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNUC_UNUSED,
 
     virObjectEventStateQueue(driver->domainEventState, event);
     virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
-
-    return 0;
 }