OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Added generic panic handler qemu_system_guest_panicked()

Browse Source 
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 <asmetanin@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Andreas Färber <afaerber@suse.de>
Message-Id: <1435924905-8926-10-git-send-email-den@openvz.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Andrey Smetanin 2015-07-03 15:01:42 +03:00 committed by Paolo Bonzini
parent 6d1f252d8c
commit 5f5b5942d5
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/misc/pvpanic.c
View File

@ -41,8 +41,7 @@ static void handle_event(int event)
} }
if (event & PVPANIC_PANICKED) { if (event & PVPANIC_PANICKED) {
qapi_event_send_guest_panicked(GUEST_PANIC_ACTION_PAUSE, &error_abort); qemu_system_guest_panicked();
vm_stop(RUN_STATE_GUEST_PANICKED);
return; return;
} }
} }

1
include/sysemu/sysemu.h
View File

@ -69,6 +69,7 @@ int qemu_reset_requested_get(void);
void qemu_system_killed(int signal, pid_t pid); void qemu_system_killed(int signal, pid_t pid);
void qemu_devices_reset(void); void qemu_devices_reset(void);
void qemu_system_reset(bool report); void qemu_system_reset(bool report);
void qemu_system_guest_panicked(void);
void qemu_add_exit_notifier(Notifier *notify); void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify); void qemu_remove_exit_notifier(Notifier *notify);

11
target-s390x/kvm.c
View File

@ -1796,13 +1796,6 @@ static bool is_special_wait_psw(CPUState *cs)
return cs->kvm_run->psw_addr == 0xfffUL; 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) static void unmanageable_intercept(S390CPU *cpu, const char *str, int pswoffset)
{ {
CPUState *cs = CPU(cpu); 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), str, cs->cpu_index, ldq_phys(cs->as, cpu->env.psa + pswoffset),
ldq_phys(cs->as, cpu->env.psa + pswoffset + 8)); ldq_phys(cs->as, cpu->env.psa + pswoffset + 8));
s390_cpu_halt(cpu); s390_cpu_halt(cpu);
guest_panicked(); qemu_system_guest_panicked();
} }
static int handle_intercept(S390CPU *cpu) static int handle_intercept(S390CPU *cpu)
@ -1844,7 +1837,7 @@ static int handle_intercept(S390CPU *cpu)
if (is_special_wait_psw(cs)) { if (is_special_wait_psw(cs)) {
qemu_system_shutdown_request(); qemu_system_shutdown_request();
} else { } else {
guest_panicked(); qemu_system_guest_panicked();
} }
} }
r = EXCP_HALTED; r = EXCP_HALTED;

6
vl.c
View File

@ -1740,6 +1740,12 @@ void qemu_system_reset(bool report)
cpu_synchronize_all_post_reset(); 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) void qemu_system_reset_request(void)
{ {
if (no_reboot) { if (no_reboot) {