From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGdsc-0003iL-65 for qemu-devel@nongnu.org; Tue, 25 Sep 2012 18:45:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGdsa-0003QS-PB for qemu-devel@nongnu.org; Tue, 25 Sep 2012 18:45:25 -0400 Received: from hall.aurel32.net ([88.191.126.93]:45394) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGdsa-0003Ou-Gb for qemu-devel@nongnu.org; Tue, 25 Sep 2012 18:45:24 -0400 Date: Wed, 26 Sep 2012 00:45:21 +0200 From: Aurelien Jarno Message-ID: <20120925224521.GE23819@ohm.aurel32.net> References: <1348523753-25083-1-git-send-email-rth@twiddle.net> <1348523753-25083-6-git-send-email-rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <1348523753-25083-6-git-send-email-rth@twiddle.net> Subject: Re: [Qemu-devel] [PATCH 5/7] target-s390x: Use CPU_LOG_INT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: qemu-devel@nongnu.org, Alexander Graf 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 > Signed-off-by: Richard Henderson > --- > 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 Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net