diff options
| author | Andrey Smetanin <asmetanin@virtuozzo.com> | 2015-07-03 15:01:42 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-09-07 18:14:03 +0200 |
| commit | 5f5b5942d56a138baad0ae01458d5d0e62d5be68 (patch) | |
| tree | a900ef9a631152932fce3f70b4c107cd51b4d1ce /target-s390x | |
| parent | 6d1f252d8c1ba73bf6ed9af28731a9c9c3d473a2 (diff) | |
| download | qemu-5f5b5942d56a138baad0ae01458d5d0e62d5be68.zip qemu-5f5b5942d56a138baad0ae01458d5d0e62d5be68.tar.gz qemu-5f5b5942d56a138baad0ae01458d5d0e62d5be68.tar.bz2 | |
Added generic panic handler qemu_system_guest_panicked()
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>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/kvm.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index ae3a0af..ba1201e 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; |