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

qemu: Remove return value from qemuMonitorDomainShutdownCallback

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 7ee4fc31ba..6679d16579 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -162,10 +162,10 @@ typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon,
                                                unsigned int micros,
                                                const char *details,
                                                void *opaque);
-typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
-                                                 virDomainObj *vm,
-                                                 virTristateBool guest,
-                                                 void *opaque);
+typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
+                                                  virDomainObj *vm,
+                                                  virTristateBool guest,
+                                                  void *opaque);
 typedef int (*qemuMonitorDomainResetCallback)(qemuMonitor *mon,
                                               virDomainObj *vm,
                                               void *opaque);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index dcf74d1573..ba0f171e57 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -570,7 +570,7 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
                           virDomainObj *vm,
                           virTristateBool guest_initiated,
@@ -642,8 +642,6 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
  unlock:
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-
-    return 0;
 }