Patchwork pcnet: Extend hardware reset

login
register
mail settings
Submitter Jan Kiszka
Date Oct. 8, 2009, 3:53 p.m.
Message ID <4ACE0B11.3010901@siemens.com>
Download mbox | patch
Permalink /patch/35462/
State Under Review
Headers show

Comments

Jan Kiszka - Oct. 8, 2009, 3:53 p.m.
Update the IRQ state and stop the poll timer on reset. Moreover,
register the reset function with qemu.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 hw/pcnet.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Patch

diff --git a/hw/pcnet.c b/hw/pcnet.c
index afeaca7..fecbff7 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;
 }