Commit 3047f8b5 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/kvm: factor out actual handling of STOP interrupts 



For KVM, the KVM module decides when a STOP can be performed (when the
STOP interrupt can be processed). Factor it out so we can use it
later for TCG.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-19-david@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 74b4c74d

target/s390x/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -418,5 +418,6 @@ void s390x_translate_init(void); 


/* sigp.c */

int handle_sigp(CPUS390XState *env, uint8_t order, uint64_t r1, uint64_t r3);

void do_stop_interrupt(CPUS390XState *env);



#endif /* S390X_INTERNAL_H */

target/s390x/kvm.c

+1 −7
Original line number Diff line number Diff line
@@ -1634,13 +1634,7 @@ static int handle_intercept(S390CPU *cpu) 
            r = EXCP_HALTED;

            break;

        case ICPT_CPU_STOP:

            if (s390_cpu_set_state(CPU_STATE_STOPPED, cpu) == 0) {

                qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

            }

            if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) {

                s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true);

            }

            cpu->env.sigp_order = 0;

            do_stop_interrupt(&cpu->env);

            r = EXCP_HALTED;

            break;

        case ICPT_OPEREXC:

target/s390x/sigp.c

+14 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg) 
    case CPU_STATE_OPERATING:

        cpu->env.sigp_order = SIGP_STOP_STORE_STATUS;

        cpu_inject_stop(cpu);

        /* store will be performed when handling the stop intercept */

        /* store will be performed in do_stop_interrup() */

        break;

    case CPU_STATE_STOPPED:

        /* already stopped, just store the status */
@@ -360,6 +360,19 @@ int s390_cpu_restart(S390CPU *cpu) 
    return 0;

}



void do_stop_interrupt(CPUS390XState *env)

{

    S390CPU *cpu = s390_env_get_cpu(env);



    if (s390_cpu_set_state(CPU_STATE_STOPPED, cpu) == 0) {

        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

    }

    if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) {

        s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true);

    }

    env->sigp_order = 0;

}



void s390_init_sigp(void)

{

    qemu_mutex_init(&qemu_sigp_mutex);