Commit 5f5b5942 authored by Andrey Smetanin's avatar Andrey Smetanin Committed by Paolo Bonzini
Browse files

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: default avatarAndrey Smetanin <asmetanin@virtuozzo.com>
Signed-off-by: default avatarDenis 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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6d1f252d

hw/misc/pvpanic.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

    }

}

include/sysemu/sysemu.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,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);

target-s390x/kvm.c

+2 −9
Original line number Diff line number Diff line
@@ -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;

vl.c

+6 −0
Original line number Diff line number Diff line
@@ -1740,6 +1740,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) {