mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
Pull request
-----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl15BlIACgkQnKSrs4Gr c8jj3gf+Ko3ZbbI6QV0AqjmoyAT00TizPPrqIuzp9U+7B8zoEg1qyrQCj6bM5Il0 kKnaYjjRM1JeeHBps9X3W+akd0sBgBsNumgTphtMDyg14GH9PPzsmlZgNPoDGNrG 1h0nf/24nNE7xC7qtThCkj7YbE0rnViKc/qwrqcfzFWQ3QRSdtfxsNf1C2Mmfkln KWZ/YqKL+Eym7DaAVTwtMJgBztPrTEWbbIiKfJBd65jja79rRa9Zo2f9H6cWS+0h nDUFlGx4qOjQ6+Mtb/++Qu2DpJTL1IB/kOTbAS2b1EIm33hinECwRRg0+wzOsEq0 tJzJe5W2hxGunvZ9RgOAP8Wp0OBhqg== =KzMY -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
cc9c8b8266
1 changed files with 3 additions and 0 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue