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

qemu: Remove return value from qemuMonitorDomainPMWakeupCallback

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 a7718ebb47..94aedbe750 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -221,9 +221,9 @@ typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon,
                                                     const char *devid,
                                                     int reason,
                                                     void *opaque);
-typedef int (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon,
-                                                 virDomainObj *vm,
-                                                 void *opaque);
+typedef void (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon,
+                                                  virDomainObj *vm,
+                                                  void *opaque);
 typedef int (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon,
                                                   virDomainObj *vm,
                                                   void *opaque);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 3a6c12e7a4..138a45ea10 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1125,7 +1125,7 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectEventStateQueue(driver->domainEventState, event);
 }
 
-static int
+static void
 qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED,
                           virDomainObj *vm,
                           void *opaque)
@@ -1160,7 +1160,6 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
     virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
-    return 0;
 }
 
 static int