From patchwork Wed Nov 5 09:56:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 406932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E8E04140098 for ; Wed, 5 Nov 2014 20:59:12 +1100 (AEDT) Received: from localhost ([::1]:45427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlxMt-0007n3-6q for incoming@patchwork.ozlabs.org; Wed, 05 Nov 2014 04:59:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlxKI-0003D9-1I for qemu-devel@nongnu.org; Wed, 05 Nov 2014 04:56:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlxK5-0004Np-Bm for qemu-devel@nongnu.org; Wed, 05 Nov 2014 04:56:29 -0500 Received: from cantor2.suse.de ([195.135.220.15]:39414 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlxK5-0004Nd-6A for qemu-devel@nongnu.org; Wed, 05 Nov 2014 04:56:17 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 36F42AD5D; Wed, 5 Nov 2014 09:56:16 +0000 (UTC) From: Alexander Graf To: qemu-devel@nongnu.org Date: Wed, 5 Nov 2014 10:56:14 +0100 Message-Id: <1415181375-112604-2-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1415181375-112604-1-git-send-email-agraf@suse.de> References: <1415181375-112604-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: peter.maydell@linaro.org, kbastian@mail.uni-paderborn.de, rth@twiddle.net Subject: [Qemu-devel] [PULL 1/2] s390x: Fix sclp console input 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 When injecting an sclp console interrupt into the guest, we increase the PC by 4 for some reason. I have no idea why I put that code there, but it's clearly wrong. Remove the increment. This patch fixes sclp serial input for the ccw machine. Signed-off-by: Alexander Graf Reviewed-by: Bastian Koppelmann --- target-s390x/interrupt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c index 23a9114..1404d0a 100644 --- a/target-s390x/interrupt.c +++ b/target-s390x/interrupt.c @@ -22,9 +22,7 @@ void s390_sclp_extint(uint32_t parm) kvm_s390_service_interrupt(parm); } else { S390CPU *dummy_cpu = s390_cpu_addr2state(0); - CPUS390XState *env = &dummy_cpu->env; - env->psw.addr += 4; cpu_inject_ext(dummy_cpu, EXT_SERVICE, parm, 0); } }