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

qemu: Remove return value from qemuMonitorDomainStopCallback

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 c94212962a..0c6943861c 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -169,9 +169,9 @@ typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
 typedef void (*qemuMonitorDomainResetCallback)(qemuMonitor *mon,
                                                virDomainObj *vm,
                                                void *opaque);
-typedef int (*qemuMonitorDomainStopCallback)(qemuMonitor *mon,
-                                             virDomainObj *vm,
-                                             void *opaque);
+typedef void (*qemuMonitorDomainStopCallback)(qemuMonitor *mon,
+                                              virDomainObj *vm,
+                                              void *opaque);
 typedef int (*qemuMonitorDomainResumeCallback)(qemuMonitor *mon,
                                                virDomainObj *vm,
                                                void *opaque);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 803ca9f563..99ad2df5e6 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -642,7 +642,7 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED,
                       virDomainObj *vm,
                       void *opaque)
@@ -700,8 +700,6 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED,
 
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-
-    return 0;
 }