From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MGyeg-0005OH-7a for qemu-devel@nongnu.org; Wed, 17 Jun 2009 13:10:34 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MGyeW-0005Db-5Y for qemu-devel@nongnu.org; Wed, 17 Jun 2009 13:10:28 -0400 Received: from [199.232.76.173] (port=54827 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MGyeU-0005Bp-C1 for qemu-devel@nongnu.org; Wed, 17 Jun 2009 13:10:22 -0400 Received: from mx2.redhat.com ([66.187.237.31]:35954) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MGyeS-0007yB-OY for qemu-devel@nongnu.org; Wed, 17 Jun 2009 13:10:21 -0400 From: Glauber Costa Date: Wed, 17 Jun 2009 13:09:58 -0400 Message-Id: <1245258604-2843-10-git-send-email-glommer@redhat.com> In-Reply-To: <1245258604-2843-9-git-send-email-glommer@redhat.com> References: <1245258604-2843-1-git-send-email-glommer@redhat.com> <1245258604-2843-2-git-send-email-glommer@redhat.com> <1245258604-2843-3-git-send-email-glommer@redhat.com> <1245258604-2843-4-git-send-email-glommer@redhat.com> <1245258604-2843-5-git-send-email-glommer@redhat.com> <1245258604-2843-6-git-send-email-glommer@redhat.com> <1245258604-2843-7-git-send-email-glommer@redhat.com> <1245258604-2843-8-git-send-email-glommer@redhat.com> <1245258604-2843-9-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 09/15] BACKPORT: Update irqs on reset and device load List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , aliguori@us.ibm.com From: Blue Swirl Signed-off-by: Blue Swirl Signed-off-by: Glauber Costa --- hw/e1000.c | 10 +++++++++- hw/rtl8139.c | 2 ++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index ba766e0..b1cf2b0 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -150,12 +150,18 @@ ioport_map(PCIDevice *pci_dev, int region_num, uint32_t addr, } static void +update_irqs(E1000State *s) +{ + qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) != 0); +} + +static void set_interrupt_cause(E1000State *s, int index, uint32_t val) { if (val) val |= E1000_ICR_INT_ASSERTED; s->mac_reg[ICR] = val; - qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) != 0); + update_irqs(s); } static void @@ -970,6 +976,7 @@ nic_load(QEMUFile *f, void *opaque, int version_id) for (j = 0; j < mac_regarraystosave[i].size; j++) qemu_get_be32s(f, s->mac_reg + mac_regarraystosave[i].array0 + j); + update_irqs(s); return 0; } @@ -1068,6 +1075,7 @@ static void e1000_reset(void *opaque) memmove(d->mac_reg, mac_reg_init, sizeof mac_reg_init); d->rxbuf_min_shift = 1; memset(&d->tx, 0, sizeof d->tx); + update_irqs(d); } PCIDevice * diff --git a/hw/rtl8139.c b/hw/rtl8139.c index 42899a5..c2f2921 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3314,6 +3314,8 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id) s->cplus_enabled = s->CpCmd != 0; } + rtl8139_update_irq(s); + return 0; } -- 1.6.2.2