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

qemu: Remove return value from qemuMonitorDomainIOErrorCallback

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 c26467cc7a..9874a2a4c3 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -183,13 +183,13 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
                                                   virDomainObj *vm,
                                                   int action,
                                                   void *opaque);
-typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
-                                                virDomainObj *vm,
-                                                const char *diskAlias,
-                                                const char *nodename,
-                                                int action,
-                                                const char *reason,
-                                                void *opaque);
+typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
+                                                 virDomainObj *vm,
+                                                 const char *diskAlias,
+                                                 const char *nodename,
+                                                 int action,
+                                                 const char *reason,
+                                                 void *opaque);
 typedef int (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon,
                                                  virDomainObj *vm,
                                                  int phase,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 95083f3f5a..31701d0b5d 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -845,7 +845,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
                          virDomainObj *vm,
                          const char *diskAlias,
@@ -912,7 +912,6 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectEventStateQueue(driver->domainEventState, ioErrorEvent);
     virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2);
     virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
-    return 0;
 }
 
 static int