From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:36955)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gleb@redhat.com>) id 1Rpiy0-0001u0-2M
	for qemu-devel@nongnu.org; Tue, 24 Jan 2012 11:11:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gleb@redhat.com>) id 1Rpixs-0007Ef-Tv
	for qemu-devel@nongnu.org; Tue, 24 Jan 2012 11:11:28 -0500
Received: from mx1.redhat.com ([209.132.183.28]:39702)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gleb@redhat.com>) id 1Rpixs-0007E9-Le
	for qemu-devel@nongnu.org; Tue, 24 Jan 2012 11:11:20 -0500
Date: Tue, 24 Jan 2012 18:11:16 +0200
From: Gleb Natapov <gleb@redhat.com>
Message-ID: <20120124161116.GC538@redhat.com>
References: <4F1ECE59.5020803@siemens.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4F1ECE59.5020803@siemens.com>
Subject: Re: [Qemu-devel] [PATCH] i8259: Do not clear level-triggered lines
	in IRR on init
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: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>, qemu-devel <qemu-devel@nongnu.org>

On Tue, Jan 24, 2012 at 04:29:29PM +0100, Jan Kiszka wrote:
> When an input line is handled as level-triggered, it will immediately
> raise an IRQ on the output of a PIC again that goes through an init
> reset. So only clear the edge-triggered inputs from IRR in that
> scenario.
> 
Looks good to me.

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  hw/i8259.c        |    2 +-
>  hw/i8259_common.c |    2 +-
>  hw/kvm/i8259.c    |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/i8259.c b/hw/i8259.c
> index 3005ce2..264bfc6 100644
> --- a/hw/i8259.c
> +++ b/hw/i8259.c
> @@ -231,8 +231,8 @@ static void pic_reset(DeviceState *dev)
>  {
>      PICCommonState *s = DO_UPCAST(PICCommonState, dev.qdev, dev);
>  
> -    pic_init_reset(s);
>      s->elcr = 0;
> +    pic_init_reset(s);
>  }
>  
>  static void pic_ioport_write(void *opaque, target_phys_addr_t addr64,
> diff --git a/hw/i8259_common.c b/hw/i8259_common.c
> index e515876..37aeee2 100644
> --- a/hw/i8259_common.c
> +++ b/hw/i8259_common.c
> @@ -28,7 +28,7 @@
>  void pic_reset_common(PICCommonState *s)
>  {
>      s->last_irr = 0;
> -    s->irr = 0;
> +    s->irr &= s->elcr;
>      s->imr = 0;
>      s->isr = 0;
>      s->priority_add = 0;
> diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c
> index 64bb5c2..298d9ca 100644
> --- a/hw/kvm/i8259.c
> +++ b/hw/kvm/i8259.c
> @@ -84,8 +84,8 @@ static void kvm_pic_reset(DeviceState *dev)
>  {
>      PICCommonState *s = DO_UPCAST(PICCommonState, dev.qdev, dev);
>  
> -    pic_reset_common(s);
>      s->elcr = 0;
> +    pic_reset_common(s);
>  
>      kvm_pic_put(s);
>  }
> -- 
> 1.7.3.4

--
			Gleb.