| Message ID | 1348523753-25083-6-git-send-email-rth@twiddle.net |
|---|---|
| State | New |
| Headers | show |
On Mon, Sep 24, 2012 at 02:55:51PM -0700, Richard Henderson wrote: > Three places in the interrupt code did we not honor the mask. > > Cc: Alexander Graf <agraf@suse.de> > Signed-off-by: Richard Henderson <rth@twiddle.net> > --- > target-s390x/helper.c | 7 ++++--- > target-s390x/misc_helper.c | 3 ++- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/target-s390x/helper.c b/target-s390x/helper.c > index a5741ec..22256b0 100644 > --- a/target-s390x/helper.c > +++ b/target-s390x/helper.c > @@ -511,7 +511,8 @@ static void do_program_interrupt(CPUS390XState *env) > 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); > > @@ -575,8 +576,8 @@ static void do_ext_interrupt(CPUS390XState *env) > > void do_interrupt(CPUS390XState *env) > { > - qemu_log("%s: %d at pc=%" PRIx64 "\n", __func__, env->exception_index, > - env->psw.addr); > + qemu_log_mask(CPU_LOG_INT, "%s: %d at pc=%" PRIx64 "\n", > + __func__, env->exception_index, env->psw.addr); > > s390_add_running_cpu(env); > /* handle external interrupts */ > diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c > index 2938ac9..e9b3cae 100644 > --- a/target-s390x/misc_helper.c > +++ b/target-s390x/misc_helper.c > @@ -53,7 +53,8 @@ void HELPER(exception)(CPUS390XState *env, uint32_t excp) > #ifndef CONFIG_USER_ONLY > 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()) { > #ifdef CONFIG_KVM > -- > 1.7.11.4 Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
diff --git a/target-s390x/helper.c b/target-s390x/helper.c index a5741ec..22256b0 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -511,7 +511,8 @@ static void do_program_interrupt(CPUS390XState *env) 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); @@ -575,8 +576,8 @@ static void do_ext_interrupt(CPUS390XState *env) void do_interrupt(CPUS390XState *env) { - qemu_log("%s: %d at pc=%" PRIx64 "\n", __func__, env->exception_index, - env->psw.addr); + qemu_log_mask(CPU_LOG_INT, "%s: %d at pc=%" PRIx64 "\n", + __func__, env->exception_index, env->psw.addr); s390_add_running_cpu(env); /* handle external interrupts */ diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 2938ac9..e9b3cae 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -53,7 +53,8 @@ void HELPER(exception)(CPUS390XState *env, uint32_t excp) #ifndef CONFIG_USER_ONLY 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()) { #ifdef CONFIG_KVM
Three places in the interrupt code did we not honor the mask. Cc: Alexander Graf <agraf@suse.de> Signed-off-by: Richard Henderson <rth@twiddle.net> --- target-s390x/helper.c | 7 ++++--- target-s390x/misc_helper.c | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-)