| Message ID | 20220609091534.1416909-4-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | virtio: various cleanups to reset code | expand |
On Thu, Jun 09 2022, Paolo Bonzini <pbonzini@redhat.com> wrote: > All calls to virtio_bus_reset are preceded by virtio_bus_stop_ioeventfd, > move the call in virtio_bus_reset: that makes sense and clarifies > that the vdc->reset function is called with ioeventfd already stopped. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hw/s390x/virtio-ccw.c | 1 - > hw/virtio/virtio-bus.c | 1 + > hw/virtio/virtio-mmio.c | 4 +--- > hw/virtio/virtio-pci.c | 1 - > 4 files changed, 2 insertions(+), 5 deletions(-) > (...) > diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c > index d7ec023adf..896feb37a1 100644 > --- a/hw/virtio/virtio-bus.c > +++ b/hw/virtio/virtio-bus.c > @@ -104,6 +104,7 @@ void virtio_bus_reset(VirtioBusState *bus) > VirtIODevice *vdev = virtio_bus_get_device(bus); > > DPRINTF("%s: reset device.\n", BUS(bus)->name); > + virtio_bus_stop_ioeventfd(bus); > if (vdev != NULL) { > virtio_reset(vdev); I looked at the code and I'm wondering under which conditions we could arrive here with vdev == NULL... virtio_bus_stop_ioeventfd() assumes that a vdev is there, at least if the ioeventfd has been started. The patch looks correct, though. Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 066a387802..e33e5207ab 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -253,7 +253,6 @@ static void virtio_ccw_reset_virtio(VirtioCcwDevice *dev) { CcwDevice *ccw_dev = CCW_DEVICE(dev); - virtio_ccw_stop_ioeventfd(dev); virtio_bus_reset(&dev->bus); if (dev->indicators) { release_indicator(&dev->routes.adapter, dev->indicators); diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index d7ec023adf..896feb37a1 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -104,6 +104,7 @@ void virtio_bus_reset(VirtioBusState *bus) VirtIODevice *vdev = virtio_bus_get_device(bus); DPRINTF("%s: reset device.\n", BUS(bus)->name); + virtio_bus_stop_ioeventfd(bus); if (vdev != NULL) { virtio_reset(vdev); } diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 41a35d31c8..6d81a26473 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -376,8 +376,7 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value, return; } if (value == 0) { - virtio_mmio_stop_ioeventfd(proxy); - virtio_reset(vdev); + virtio_bus_reset(&vdev->bus); } else { virtio_queue_set_addr(vdev, vdev->queue_sel, value << proxy->guest_page_shift); @@ -628,7 +627,6 @@ static void virtio_mmio_reset(DeviceState *d) VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d); int i; - virtio_mmio_stop_ioeventfd(proxy); virtio_bus_reset(&proxy->bus); proxy->host_features_sel = 0; proxy->guest_features_sel = 0; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 0566ad7d00..45327f0b31 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1945,7 +1945,6 @@ static void virtio_pci_reset(DeviceState *qdev) PCIDevice *dev = PCI_DEVICE(qdev); int i; - virtio_pci_stop_ioeventfd(proxy); virtio_bus_reset(bus); msix_unuse_all_vectors(&proxy->pci_dev);
All calls to virtio_bus_reset are preceded by virtio_bus_stop_ioeventfd, move the call in virtio_bus_reset: that makes sense and clarifies that the vdc->reset function is called with ioeventfd already stopped. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/s390x/virtio-ccw.c | 1 - hw/virtio/virtio-bus.c | 1 + hw/virtio/virtio-mmio.c | 4 +--- hw/virtio/virtio-pci.c | 1 - 4 files changed, 2 insertions(+), 5 deletions(-)