From patchwork Tue Jan 24 15:29:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 137578 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 183D4B6F13 for ; Wed, 25 Jan 2012 02:29:50 +1100 (EST) Received: from localhost ([::1]:43883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpiJb-0001ws-0Y for incoming@patchwork.ozlabs.org; Tue, 24 Jan 2012 10:29:43 -0500 Received: from eggs.gnu.org ([140.186.70.92]:33914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpiJQ-0001wl-FQ for qemu-devel@nongnu.org; Tue, 24 Jan 2012 10:29:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpiJP-00012F-El for qemu-devel@nongnu.org; Tue, 24 Jan 2012 10:29:32 -0500 Received: from goliath.siemens.de ([192.35.17.28]:20427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpiJP-000129-3G for qemu-devel@nongnu.org; Tue, 24 Jan 2012 10:29:31 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id q0OFTUSO016205; Tue, 24 Jan 2012 16:29:30 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q0OFTTMD009477; Tue, 24 Jan 2012 16:29:29 +0100 Message-ID: <4F1ECE59.5020803@siemens.com> Date: Tue, 24 Jan 2012 16:29:29 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: qemu-devel , Anthony Liguori X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: Gleb Natapov Subject: [Qemu-devel] [PATCH] i8259: Do not clear level-triggered lines in IRR on init 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 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. Signed-off-by: Jan Kiszka --- 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); }