Commit 02bb9bbf authored by Richard Henderson's avatar Richard Henderson Committed by Peter Maydell
Browse files

target-s390x: Use cpu_exec_interrupt qom hook 



Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-id: 1410626734-3804-9-git-send-email-rth@twiddle.net
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 37f3616a

cpu-exec.c

+0 −6
Original line number Diff line number Diff line
@@ -663,12 +663,6 @@ int cpu_exec(CPUArchState *env) 
                        do_interrupt_m68k_hardirq(env);

                        next_tb = 0;

                    }

#elif defined(TARGET_S390X) && !defined(CONFIG_USER_ONLY)

                    if ((interrupt_request & CPU_INTERRUPT_HARD) &&

                        (env->psw.mask & PSW_MASK_EXT)) {

                        cc->do_interrupt(cpu);

                        next_tb = 0;

                    }

#endif

                    /* The target hook has 3 exit conditions:

                       False when the interrupt isn't processed,

target-s390x/cpu-qom.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static inline S390CPU *s390_env_get_cpu(CPUS390XState *env) 
#define ENV_OFFSET offsetof(S390CPU, env)



void s390_cpu_do_interrupt(CPUState *cpu);

bool s390_cpu_exec_interrupt(CPUState *cpu, int int_req);

void s390_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,

                         int flags);

int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,

target-s390x/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) 
    cc->get_phys_page_debug = s390_cpu_get_phys_page_debug;

    cc->write_elf64_note = s390_cpu_write_elf64_note;

    cc->write_elf64_qemunote = s390_cpu_write_elf64_qemunote;

    cc->cpu_exec_interrupt = s390_cpu_exec_interrupt;

#endif

    dc->vmsd = &vmstate_s390_cpu;

    cc->gdb_num_core_regs = S390_NUM_CORE_REGS;

target-s390x/helper.c

+13 −0
Original line number Diff line number Diff line
@@ -876,4 +876,17 @@ void s390_cpu_do_interrupt(CPUState *cs) 
    }

}



bool s390_cpu_exec_interrupt(CPUState *cs, int interrupt_request)

{

    if (interrupt_request & CPU_INTERRUPT_HARD) {

        S390CPU *cpu = S390_CPU(cs);

        CPUS390XState *env = &cpu->env;



        if (env->psw.mask & PSW_MASK_EXT) {

            s390_cpu_do_interrupt(cs);

            return true;

        }

    }

    return false;

}

#endif /* CONFIG_USER_ONLY */