From patchwork Mon Sep 24 21:55:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 186594 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 08D952C0087 for ; Tue, 25 Sep 2012 08:10:42 +1000 (EST) Received: from localhost ([::1]:45042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGGe0-0006pm-MD for incoming@patchwork.ozlabs.org; Mon, 24 Sep 2012 17:56:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGGdN-0005Si-73 for qemu-devel@nongnu.org; Mon, 24 Sep 2012 17:56:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGGdM-0005vG-5J for qemu-devel@nongnu.org; Mon, 24 Sep 2012 17:56:09 -0400 Received: from mail-qa0-f45.google.com ([209.85.216.45]:45367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGGdM-0005tZ-0n for qemu-devel@nongnu.org; Mon, 24 Sep 2012 17:56:08 -0400 Received: by mail-qa0-f45.google.com with SMTP id c10so3227234qad.4 for ; Mon, 24 Sep 2012 14:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=zyccgIOkZZEK/PBF+SsLDLknX9ojSzT5G2O20BFnsL4=; b=yBRDFhcBrwbpM0xZxZWrIfRZJGfBU0Do9vz+dLiwsWf6pCACiW7M3x90pAdeo0pF6T dcS/vAvgXcXG40kyetxUcBzPeptLP8mf3Tb2SQZLYgRWUw9jndXLy++aF6FiMXbGoSj+ Z748yQNmeXeiOP1rvlGL8jF5MCeoD5Yb8eA/YBNnepZbie733buwHAIMNpeHuZeT7yKd qVMIoj1rBZaiCM1cjSWqFWXzYHdxThlLc/F8QXgwo8LcKfpa21CqM2Wcd0sxfGZ/Hzxy H8P/ShIjXwAqqUnU4bx2xePXKEFM1ivGYKfvB9eB7wsQJvEIU9I71u6LEIcMNoI5lZ4E 52Sg== Received: by 10.224.174.75 with SMTP id s11mr35081774qaz.88.1348523767735; Mon, 24 Sep 2012 14:56:07 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id ck11sm27100748qab.17.2012.09.24.14.56.06 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 14:56:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Sep 2012 14:55:51 -0700 Message-Id: <1348523753-25083-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348523753-25083-1-git-send-email-rth@twiddle.net> References: <1348523753-25083-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.216.45 Cc: Alexander Graf , aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 5/7] target-s390x: Use CPU_LOG_INT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Three places in the interrupt code did we not honor the mask. Cc: Alexander Graf Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- 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