From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSYAk-0006nf-6R for qemu-devel@nongnu.org; Mon, 21 Nov 2011 13:00:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RSYAi-0006t0-Jg for qemu-devel@nongnu.org; Mon, 21 Nov 2011 13:00:50 -0500 Received: from mail-qw0-f52.google.com ([209.85.216.52]:57194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSYAi-0006qo-Gf for qemu-devel@nongnu.org; Mon, 21 Nov 2011 13:00:48 -0500 Received: by mail-qw0-f52.google.com with SMTP id z3so498993qad.4 for ; Mon, 21 Nov 2011 10:00:48 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 21 Nov 2011 19:00:31 +0100 Message-Id: <1321898431-18449-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1321898431-18449-1-git-send-email-pbonzini@redhat.com> References: <1321898431-18449-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] rtc: clear non-PF bits when reinjecting on ack List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org When an rtc interrupt is reinjected immediately after being acked, other interrupts should not be reinjected, so do clear their bits. Also, if the periodic interrupts have been disabled before acking, do not reinject, as the guest might get very confused! Signed-off-by: Paolo Bonzini --- hw/mc146818rtc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index b942ce2..5d17cca 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -479,10 +479,13 @@ static uint32_t cmos_ioport_read(void *opaque, uint32_t addr) case RTC_REG_C: ret = s->cmos_data[s->cmos_index]; qemu_irq_lower(s->irq); + s->cmos_data[RTC_REG_C] = 0x00; #ifdef TARGET_I386 if(s->irq_coalesced && + (s->cmos_data[RTC_REG_B] & REG_B_PIE) && s->irq_reinject_on_ack_count < RTC_REINJECT_ON_ACK_COUNT) { s->irq_reinject_on_ack_count++; + s->cmos_data[RTC_REG_C] |= REG_C_IRQF | REG_C_PF; apic_reset_irq_delivered(); DPRINTF_C("cmos: injecting on ack\n"); qemu_irq_raise(s->irq); @@ -491,11 +494,8 @@ static uint32_t cmos_ioport_read(void *opaque, uint32_t addr) DPRINTF_C("cmos: coalesced irqs decreased to %d\n", s->irq_coalesced); } - break; } #endif - - s->cmos_data[RTC_REG_C] = 0x00; break; default: ret = s->cmos_data[s->cmos_index]; -- 1.7.7.1