diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-15 14:50:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-15 14:50:10 -0700 |
| commit | 3b1f00aceb7a67bf079a5a64aa5c6baf78a8f442 (patch) | |
| tree | c0ae4d9f2052bd3d7ebd5be3a503c97fb5c0a4a1 /drivers | |
| parent | 8625732e7712882bd14e1fce962bdc3c315acd41 (diff) | |
| parent | 245cdd9fbd396483d501db83047116e2530f245f (diff) | |
| download | lwn-3b1f00aceb7a67bf079a5a64aa5c6baf78a8f442.tar.gz lwn-3b1f00aceb7a67bf079a5a64aa5c6baf78a8f442.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin:
"Some minor bugfixes"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vhost/test: stop device before reset
tools/virtio: xen stub
tools/virtio: more stubs
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vhost/test.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c index 7804869c6a31..056308008288 100644 --- a/drivers/vhost/test.c +++ b/drivers/vhost/test.c @@ -161,6 +161,7 @@ static int vhost_test_release(struct inode *inode, struct file *f) vhost_test_stop(n, &private); vhost_test_flush(n); + vhost_dev_stop(&n->dev); vhost_dev_cleanup(&n->dev); /* We do an extra flush before freeing memory, * since jobs can re-queue themselves. */ @@ -237,6 +238,7 @@ static long vhost_test_reset_owner(struct vhost_test *n) } vhost_test_stop(n, &priv); vhost_test_flush(n); + vhost_dev_stop(&n->dev); vhost_dev_reset_owner(&n->dev, umem); done: mutex_unlock(&n->dev.mutex); |