From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Thu, 8 Oct 2009 15:53:53 +0000 (+0200)
Subject: pcnet: Extend hardware reset
X-Git-Tag: v0.12.0-rc0~666
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de41ac924bb2cf7cb8aaaa8c7f95a38c6d9b3783;p=thirdparty%2Fqemu.git

pcnet: Extend hardware reset

Update the IRQ state and stop the poll timer on reset. Moreover,
register the reset function with qemu.

Patchworks-ID: 35462
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pcnet.c b/hw/pcnet.c
index afeaca7f1df..fecbff7db4f 100644
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -1624,6 +1624,8 @@ static void pcnet_h_reset(void *opaque)
     s->bcr[BCR_PLAT ] = 0xff06;
 
     pcnet_s_reset(s);
+    pcnet_update_irq(s);
+    pcnet_poll_timer(s);
 }
 
 static void pcnet_aprom_writeb(void *opaque, uint32_t addr, uint32_t val)
@@ -1966,6 +1968,7 @@ static int pcnet_common_init(DeviceState *dev, PCNetState *s,
     s->vc = qdev_get_vlan_client(dev,
                                  pcnet_can_receive, pcnet_receive, NULL,
                                  cleanup, s);
+    qemu_register_reset(pcnet_h_reset, s);
     pcnet_h_reset(s);
     return 0;
 }