Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b1f00ac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8625732e 245cdd9f

drivers/vhost/test.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

tools/virtio/crypto/hash.h

0 → 100644
+0 −0

Empty file added.

tools/virtio/linux/dma-mapping.h

+2 −0
Original line number Diff line number Diff line
@@ -29,4 +29,6 @@ enum dma_data_direction { 
#define dma_unmap_single(...) do { } while (0)

#define dma_unmap_page(...) do { } while (0)



#define dma_max_mapping_size(...) SIZE_MAX



#endif

tools/virtio/xen/xen.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef XEN_XEN_STUB_H

#define XEN_XEN_STUB_H



#define xen_domain() 0



#endif