[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 08/23] target-s390x: Use cpu_exec_interrupt qom
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH 08/23] target-s390x: Use cpu_exec_interrupt qom hook |
Date: |
Tue, 16 Sep 2014 19:41:12 +0100 |
User-agent: |
mu4e 0.9.9.5; emacs 24.3.1 |
Richard Henderson writes:
> Cc: Alexander Graf <address@hidden>
> Signed-off-by: Richard Henderson <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
> ---
> cpu-exec.c | 6 ------
> target-s390x/cpu-qom.h | 1 +
> target-s390x/cpu.c | 1 +
> target-s390x/helper.c | 13 +++++++++++++
> 4 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/cpu-exec.c b/cpu-exec.c
> index 304867d..08be521 100644
> --- a/cpu-exec.c
> +++ b/cpu-exec.c
> @@ -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,
> diff --git a/target-s390x/cpu-qom.h b/target-s390x/cpu-qom.h
> index 80dd741..4f7d4cb 100644
> --- a/target-s390x/cpu-qom.h
> +++ b/target-s390x/cpu-qom.h
> @@ -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,
> diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
> index 97a9216..2cfeb82 100644
> --- a/target-s390x/cpu.c
> +++ b/target-s390x/cpu.c
> @@ -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;
> diff --git a/target-s390x/helper.c b/target-s390x/helper.c
> index 67ab106..e21afe6 100644
> --- a/target-s390x/helper.c
> +++ b/target-s390x/helper.c
> @@ -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 */
--
Alex Bennée
- Re: [Qemu-devel] [PATCH 03/23] target-i386: Use cpu_exec_enter/exit qom hooks, (continued)
- [Qemu-devel] [PATCH 06/23] qom: Add cpu_exec_interrupt hook, Richard Henderson, 2014/09/13
- [Qemu-devel] [PATCH 08/23] target-s390x: Use cpu_exec_interrupt qom hook, Richard Henderson, 2014/09/13
- Re: [Qemu-devel] [PATCH 08/23] target-s390x: Use cpu_exec_interrupt qom hook,
Alex Bennée <=
- [Qemu-devel] [PATCH 09/23] target-m68k: Use cpu_exec_interrupt qom hook, Richard Henderson, 2014/09/13
- [Qemu-devel] [PATCH 07/23] target-xtensa: Use cpu_exec_interrupt qom hook, Richard Henderson, 2014/09/13
[Qemu-devel] [PATCH 10/23] target-cris: Use cpu_exec_interrupt qom hook, Richard Henderson, 2014/09/13
[Qemu-devel] [PATCH 12/23] target-sh4: Use cpu_exec_interrupt qom hook, Richard Henderson, 2014/09/13
[Qemu-devel] [PATCH 11/23] target-alpha: Use cpu_exec_interrupt qom hook, Richard Henderson, 2014/09/13