@@ -1069,6 +1069,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);
+ pci_device_reset_default(&d->dev);
}
static NetClientInfo net_e1000_info = {
@@ -358,6 +358,8 @@ static void lsi_soft_reset(LSIState *s)
qemu_free(s->current);
s->current = NULL;
}
+
+ pci_device_reset_default(&s->dev);
}
static int lsi_dma_40bit(LSIState *s)
@@ -171,6 +171,11 @@ void pci_device_reset_default(PCIDevice *dev)
pci_update_mappings(dev);
}
+static void pci_device_reset_default_fn(DeviceState *qdev)
+{
+ pci_device_reset_default(DO_UPCAST(PCIDevice, qdev, qdev));
+}
+
void pci_device_reset(PCIDevice *dev)
{
if (!dev->qdev.info) {
@@ -180,10 +185,6 @@ void pci_device_reset(PCIDevice *dev)
}
qdev_reset(&dev->qdev);
-
- /* TODO: make DeviceInfo::reset call
- pci_device_reset_default() itself. */
- pci_device_reset_default(dev);
}
void pci_bus_reset(PCIBus *bus)
@@ -1614,6 +1615,9 @@ void pci_qdev_register(PCIDeviceInfo *info)
info->qdev.unplug = pci_unplug_device;
info->qdev.exit = pci_unregister_device;
info->qdev.bus_info = &pci_bus_info;
+ if (!info->qdev.reset) {
+ info->qdev.reset = pci_device_reset_default_fn;
+ }
qdev_register(&info->qdev);
}
@@ -2036,6 +2036,7 @@ static void pci_reset(DeviceState *dev)
PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev.qdev, dev);
pcnet_h_reset(&d->state);
+ pci_device_reset_default(&d->pci_dev);
}
static PCIDeviceInfo pcnet_info = {
@@ -1260,6 +1260,8 @@ static void rtl8139_reset(DeviceState *d)
/* reset tally counters */
RTL8139TallyCounters_clear(&s->tally_counters);
+
+ pci_device_reset_default(&s->dev);
}
static void RTL8139TallyCounters_clear(RTL8139TallyCounters* counters)
@@ -184,6 +184,7 @@ static void virtio_pci_reset(DeviceState *d)
virtio_reset(proxy->vdev);
msix_reset(&proxy->pci_dev);
proxy->bugs = 0;
+ pci_device_reset_default(&proxy->pci_dev);
}
static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)
Eliminate work around in pci_device_reset() by making each pci reset function to call pci_device_reset_default(). If a driver reset function isn't specified, set it to pci default reset function. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- hw/e1000.c | 1 + hw/lsi53c895a.c | 2 ++ hw/pci.c | 12 ++++++++---- hw/pcnet.c | 1 + hw/rtl8139.c | 2 ++ hw/virtio-pci.c | 1 + 6 files changed, 15 insertions(+), 4 deletions(-)