mirror of
https://github.com/libvirt/libvirt.git
synced 2026-10-02 12:20:06 -05:00
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>
This commit is contained in:
1 parent
79b6d701c7
commit
0f18f6813c
2 files changed
+3
-6
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user