processGuestPanicEvent: Don't pass panic action via parameter

'processGuestPanicEvent' gets the full domain object; there's no point
passing it via 'struct qemuProcessEvent'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c64e5bb4f593e72789b4d4cdd4114c715d9d9e8a..663e6c33cfefabf575f487c4c968c5d78dd735f4 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3615,7 +3615,6 @@ qemuProcessGuestPanicEventInfo(virQEMUDriver *driver,
 static void
 processGuestPanicEvent(virQEMUDriver *driver,
                        virDomainObj *vm,
-                       int action,
                        qemuMonitorEventPanicInfo *info)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
@@ -3650,7 +3649,7 @@ processGuestPanicEvent(virQEMUDriver *driver,
         VIR_WARN("Unable to release lease on %s", vm->def->name);
     VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState));
 
-    switch (action) {
+    switch (vm->def->onCrash) {
     case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY:
         if (doCoreDumpToAutoDumpPath(driver, vm, flags) < 0)
             goto endjob;
@@ -4208,8 +4207,7 @@ qemuProcessEventHandler(void *data,
         processWatchdogEvent(driver, vm, processEvent->action);
         break;
     case QEMU_PROCESS_EVENT_GUESTPANIC:
-        processGuestPanicEvent(driver, vm, processEvent->action,
-                               processEvent->data);
+        processGuestPanicEvent(driver, vm, processEvent->data);
         break;
     case QEMU_PROCESS_EVENT_DEVICE_DELETED:
         processDeviceDeletedEvent(driver, vm, processEvent->data);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 397082ef04498dc59ba5ca27c3917959464370d5..8389819ee4234c1337912b257a9ce75d4fc91bfa 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1359,8 +1359,7 @@ qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_UNUSED,
 {
     virObjectLock(vm);
 
-    qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_GUESTPANIC,
-                           vm->def->onCrash, 0, info);
+    qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_GUESTPANIC, 0, 0, info);
 
     virObjectUnlock(vm);
 }