From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 1 Sep 2009 07:56:13 +0000 (+0200)
Subject: qdev: convert rtl8139 to reset
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~10681
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f82de8f08a7d5add367067e4b7911c9fc9892bb0;p=sdk%2Femulator%2Fqemu.git

qdev: convert rtl8139 to reset

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index b3542a3..3bd72e5 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -3465,7 +3465,6 @@ static int pci_rtl8139_init(PCIDevice *dev)
                            PCI_ADDRESS_SPACE_MEM, rtl8139_mmio_map);
 
     qdev_get_macaddr(&dev->qdev, s->macaddr);
-    qemu_register_reset(rtl8139_reset, s);
     rtl8139_reset(s);
     s->vc = qdev_get_vlan_client(&dev->qdev,
                                  rtl8139_can_receive, rtl8139_receive, NULL,
@@ -3489,9 +3488,10 @@ static int pci_rtl8139_init(PCIDevice *dev)
 }
 
 static PCIDeviceInfo rtl8139_info = {
-    .qdev.name = "rtl8139",
-    .qdev.size = sizeof(RTL8139State),
-    .init      = pci_rtl8139_init,
+    .qdev.name  = "rtl8139",
+    .qdev.size  = sizeof(RTL8139State),
+    .qdev.reset = rtl8139_reset,
+    .init       = pci_rtl8139_init,
 };
 
 static void rtl8139_register_devices(void)