From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46543)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kbastian@mail.uni-paderborn.de>) id 1XliTp-0002j9-8Z
	for qemu-devel@nongnu.org; Tue, 04 Nov 2014 13:05:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kbastian@mail.uni-paderborn.de>) id 1XliTi-0007BK-TB
	for qemu-devel@nongnu.org; Tue, 04 Nov 2014 13:05:21 -0500
Received: from mail.uni-paderborn.de ([131.234.142.9]:54054)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kbastian@mail.uni-paderborn.de>) id 1XliTi-0007BE-ML
	for qemu-devel@nongnu.org; Tue, 04 Nov 2014 13:05:14 -0500
Message-ID: <5459237D.4000704@mail.uni-paderborn.de>
Date: Tue, 04 Nov 2014 19:05:33 +0000
From: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
MIME-Version: 1.0
References: <1415103708-115450-1-git-send-email-agraf@suse.de>
	<1415103708-115450-2-git-send-email-agraf@suse.de>
In-Reply-To: <1415103708-115450-2-git-send-email-agraf@suse.de>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1/2] s390x: Fix sclp console input
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alexander Graf <agraf@suse.de>, rth@twiddle.net
Cc: qemu-devel@nongnu.org

On 11/04/2014 12:21 PM, Alexander Graf wrote:
> 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 <agraf@suse.de>
> ---
>   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);
>       }
>   }
Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>