diff options
| author | Peter Maydell | 2019-09-13 12:52:11 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-09-13 12:52:11 +0200 |
| commit | cc9c8b82669e22bf2440ccb54a7a0ebee7627a28 (patch) | |
| tree | 88145613ae5bdd79a98c0c40fe4a3917787629d3 | |
| parent | Merge remote-tracking branch 'remotes/berrange/tags/filemon-test-pull-request... (diff) | |
| parent | virtio-blk: Cancel the pending BH when the dataplane is reset (diff) | |
| download | qemu-cc9c8b82669e22bf2440ccb54a7a0ebee7627a28.tar.gz qemu-cc9c8b82669e22bf2440ccb54a7a0ebee7627a28.tar.xz qemu-cc9c8b82669e22bf2440ccb54a7a0ebee7627a28.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
# gpg: Signature made Wed 11 Sep 2019 15:36:02 BST
# gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
virtio-blk: Cancel the pending BH when the dataplane is reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/block/dataplane/virtio-blk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 9299a1a7c2..119906a5fe 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -298,6 +298,9 @@ void virtio_blk_data_plane_stop(VirtIODevice *vdev) virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i); } + qemu_bh_cancel(s->bh); + notify_guest_bh(s); /* final chance to notify guest */ + /* Clean up guest notifier (irq) */ k->set_guest_notifiers(qbus->parent, nvqs, false); |