david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-s390x: Use CPU_LOG_INT

Browse Source 
Three places in the interrupt code did we not honor the mask.

Reviewed-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Richard Henderson 2012-09-24 14:55:51 -07:00 committed by Aurelien Jarno
parent daa47c34a8
commit 0d404541b2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target-s390x/helper.c
View File

@ -511,7 +511,8 @@ static void do_program_interrupt(CPUS390XState *env)
break; break;
} }
qemu_log("%s: code=0x%x ilc=%d\n", __func__, env->int_pgm_code, ilc); qemu_log_mask(CPU_LOG_INT, "%s: code=0x%x ilc=%d\n",
__func__, env->int_pgm_code, ilc);
lowcore = cpu_physical_memory_map(env->psa, &len, 1); lowcore = cpu_physical_memory_map(env->psa, &len, 1);
@ -575,8 +576,8 @@ static void do_ext_interrupt(CPUS390XState *env)
void do_interrupt(CPUS390XState *env) void do_interrupt(CPUS390XState *env)
{ {
qemu_log("%s: %d at pc=%" PRIx64 "\n", __func__, env->exception_index, qemu_log_mask(CPU_LOG_INT, "%s: %d at pc=%" PRIx64 "\n",
env->psw.addr); __func__, env->exception_index, env->psw.addr);
s390_add_running_cpu(env); s390_add_running_cpu(env);
/* handle external interrupts */ /* handle external interrupts */

3
target-s390x/misc_helper.c
View File

@ -53,7 +53,8 @@ void HELPER(exception)(CPUS390XState *env, uint32_t excp)
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
void program_interrupt(CPUS390XState *env, uint32_t code, int ilc) void program_interrupt(CPUS390XState *env, uint32_t code, int ilc)
{ {
qemu_log("program interrupt at %#" PRIx64 "\n", env->psw.addr); qemu_log_mask(CPU_LOG_INT, "program interrupt at %#" PRIx64 "\n",
env->psw.addr);
if (kvm_enabled()) { if (kvm_enabled()) {
#ifdef CONFIG_KVM #ifdef CONFIG_KVM