Eliminate work around in pci_device_reset() by making each pci reset function to call pci_device_reset_default(). Each device should know reset itself. It shouldn't be done pci generic layer automatically. PCI layer should just signal reset and let each device respond to reset.
Signed-off-by: Isaku Yamahata <yamah...@valinux.co.jp> --- hw/e1000.c | 1 + hw/lsi53c895a.c | 2 ++ hw/pci.c | 6 ------ hw/pcnet.c | 1 + hw/rtl8139.c | 2 ++ hw/virtio-pci.c | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 8d87492..0f303b0 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1077,6 +1077,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 = { diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index bd7b661..3e59e05 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -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) diff --git a/hw/pci.c b/hw/pci.c index 731d367..54cb89b 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -171,13 +171,7 @@ void pci_device_reset(PCIDevice *dev) return; } - /* - * TODO: - * Each device should know all its states. - * So move this part to each device specific callback. - */ qdev_reset(&dev->qdev); - pci_device_reset_default(dev); } /* diff --git a/hw/pcnet.c b/hw/pcnet.c index b52935a..e73e682 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -2023,6 +2023,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 = { diff --git a/hw/rtl8139.c b/hw/rtl8139.c index d92981d..1f35e5d 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -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) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index c728fff..d9b97be 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -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) -- 1.7.1.1