]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Remove return value from qemuMonitorDomainMemoryFailureCallback
authorPeter Krempa <pkrempa@redhat.com>
Tue, 20 Jul 2021 08:05:06 +0000 (10:05 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 23 Jul 2021 08:01:48 +0000 (10:01 +0200)
Change the callback prototype and fix the callback registered in the
process code.

The removed error messages are impossible as the enum values are
converted via VIR_ENUM helpers and guarded by compiler checks.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_monitor.h
src/qemu/qemu_process.c

index c474668c9c5d951afd8a77d0e6aa7c143ce3901b..1491c1297c82c97255a32ce4d34351e52675abf7 100644 (file)
@@ -356,10 +356,10 @@ struct _qemuMonitorEventMemoryFailure {
     bool recursive;
 };
 
-typedef int (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitor *mon,
-                                                      virDomainObj *vm,
-                                                      qemuMonitorEventMemoryFailure *mfp,
-                                                      void *opaque);
+typedef void (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitor *mon,
+                                                       virDomainObj *vm,
+                                                       qemuMonitorEventMemoryFailure *mfp,
+                                                       void *opaque);
 
 typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks;
 struct _qemuMonitorCallbacks {
index 778ee55c1106d2da25623346bdb5329a6125ca6f..2e2a9498f0114b4a1be6d02e1c13498fbd42a6c0 100644 (file)
@@ -1815,7 +1815,7 @@ qemuProcessHandleGuestCrashloaded(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNUC_UNUSED,
                                virDomainObj *vm,
                                qemuMonitorEventMemoryFailure *mfp,
@@ -1836,9 +1836,7 @@ qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNUC_UNUSED,
         break;
     case QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_LAST:
     default:
-        virReportError(VIR_ERR_INVALID_ARG, "%s",
-                       _("requested unknown memory failure recipient"));
-        return -1;
+        return;
     }
 
     switch (mfp->action) {
@@ -1856,9 +1854,7 @@ qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNUC_UNUSED,
         break;
     case QEMU_MONITOR_MEMORY_FAILURE_ACTION_LAST:
     default:
-        virReportError(VIR_ERR_INVALID_ARG, "%s",
-                       _("requested unknown memory failure action"));
-        return -1;
+        return;
     }
 
     if (mfp->action_required)
@@ -1868,8 +1864,6 @@ qemuProcessHandleMemoryFailure(qemuMonitor *mon G_GNUC_UNUSED,
 
     event = virDomainEventMemoryFailureNewFromObj(vm, recipient, action, flags);
     virObjectEventStateQueue(driver->domainEventState, event);
-
-    return 0;
 }