[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/12] Added generic panic handler qemu_system_guest
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 09/12] Added generic panic handler qemu_system_guest_panicked() |
Date: |
Fri, 3 Jul 2015 15:01:42 +0300 |
From: Andrey Smetanin <address@hidden>
There are pieces of guest panic handling code
that can be shared in one generic function.
These code replaced by call qemu_system_guest_panicked().
Signed-off-by: Andrey Smetanin <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Paolo Bonzini <address@hidden>
CC: Andreas Färber <address@hidden>
---
hw/misc/pvpanic.c | 3 +--
include/sysemu/sysemu.h | 1 +
target-s390x/kvm.c | 11 ++---------
vl.c | 6 ++++++
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 994f8af..3709488 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -41,8 +41,7 @@ static void handle_event(int event)
}
if (event & PVPANIC_PANICKED) {
- qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_PAUSE, &error_abort);
- vm_stop(RUN_STATE_GUEST_PANICKED);
+ qemu_system_guest_panicked();
return;
}
}
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index df80951..70164c9 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -68,6 +68,7 @@ int qemu_reset_requested_get(void);
void qemu_system_killed(int signal, pid_t pid);
void qemu_devices_reset(void);
void qemu_system_reset(bool report);
+void qemu_system_guest_panicked(void);
void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify);
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 135111a..e5bd3ef 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -1796,13 +1796,6 @@ static bool is_special_wait_psw(CPUState *cs)
return cs->kvm_run->psw_addr == 0xfffUL;
}
-static void guest_panicked(void)
-{
- qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_PAUSE,
- &error_abort);
- vm_stop(RUN_STATE_GUEST_PANICKED);
-}
-
static void unmanageable_intercept(S390CPU *cpu, const char *str, int
pswoffset)
{
CPUState *cs = CPU(cpu);
@@ -1811,7 +1804,7 @@ static void unmanageable_intercept(S390CPU *cpu, const
char *str, int pswoffset)
str, cs->cpu_index, ldq_phys(cs->as, cpu->env.psa +
pswoffset),
ldq_phys(cs->as, cpu->env.psa + pswoffset + 8));
s390_cpu_halt(cpu);
- guest_panicked();
+ qemu_system_guest_panicked();
}
static int handle_intercept(S390CPU *cpu)
@@ -1844,7 +1837,7 @@ static int handle_intercept(S390CPU *cpu)
if (is_special_wait_psw(cs)) {
qemu_system_shutdown_request();
} else {
- guest_panicked();
+ qemu_system_guest_panicked();
}
}
r = EXCP_HALTED;
diff --git a/vl.c b/vl.c
index 69ad90c..38eee1f 100644
--- a/vl.c
+++ b/vl.c
@@ -1721,6 +1721,12 @@ void qemu_system_reset(bool report)
cpu_synchronize_all_post_reset();
}
+void qemu_system_guest_panicked(void)
+{
+ qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_PAUSE, &error_abort);
+ vm_stop(RUN_STATE_GUEST_PANICKED);
+}
+
void qemu_system_reset_request(void)
{
if (no_reboot) {
--
2.1.4
- [Qemu-devel] [PATCH v6 0/12] HyperV equivalent of pvpanic driver, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 2/12] kvm: introduce vcpu_debug = kvm_debug + vcpu context, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 5/12] kvm: added KVM_REQ_HV_CRASH value to notify qemu about hyper-v crash, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 3/12] kvm: add hyper-v crash msrs values, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 6/12] kvm/x86: mark hyper-v crash msrs as partition wide, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 10/12] kvm: Add kvm system event crash handler, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 8/12] kvm/x86: add sending hyper-v crash notification to user space, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 4/12] kvm/x86: added hyper-v crash msrs into kvm hyperv context, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 09/12] Added generic panic handler qemu_system_guest_panicked(),
Denis V. Lunev <=
- [Qemu-devel] [PATCH 7/12] kvm/x86: added hyper-v crash data and ctl msr's get/set'ers, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 1/12] kvm/x86: move Hyper-V MSR's/hypercall code into hyperv.c file, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 11/12] cpu: Add crash_occurred flag into CPUState, Denis V. Lunev, 2015/07/03
- [Qemu-devel] [PATCH 12/12] i386/kvm: Hyper-v crash msrs set/get'ers and migration, Denis V. Lunev, 2015/07/03
- Re: [Qemu-devel] [PATCH v6 0/12] HyperV equivalent of pvpanic driver, Paolo Bonzini, 2015/07/07