linux.git/drivers/vhost, branch v3.10-rc2

Add missing module license tag to vring helpers.

2013-05-08T01:19:03+00:00

[  624.286653] vringh: module license 'unspecified' taints kernel.

Signed-off-by: Dave Jones 
Signed-off-by: Rusty Russell

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2013-05-07T17:13:52+00:00

Pull more vhost fixes from Michael Tsirkin:
 "This fixes some minor issues in the patches that have been merged.

  We also finally drop the workaround disabling event_idx for scsi: it
  was always questionable, and now we know it's not needed.

  There's also a memory leak fix"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost-scsi: Enable VIRTIO_RING_F_EVENT_IDX
  vhost: drop virtio_net.h dependency
  vhost-net: Cleanup vhost_ubuf and vhost_zcopy
  vhost: Remove vhost_enable_zcopy in vhost.h
  vhost: Remove comments for hdr in vhost.h
  vhost: Move VHOST_NET_FEATURES to net.c
  vhost-net: Free ubuf when vhost_dev_set_owner fails
  vhost: Export vhost_dev_set_owner

vhost-scsi: Enable VIRTIO_RING_F_EVENT_IDX

2013-05-07T08:11:08+00:00

It was disabled as a workaround. Now userspace bits work fine with it.
The broken version was not ever committed to QEMU, I guess the same is
true for nlkt.

So, let's enable it.

Signed-off-by: Asias He 
Acked-by: Paolo Bonzini 
Signed-off-by: Michael S. Tsirkin

vhost: drop virtio_net.h dependency

2013-05-06T11:04:06+00:00

There's no net specific code in vhost.c anymore,
don't include the virtio_net.h header.

Signed-off-by: Michael S. Tsirkin

vhost-net: Cleanup vhost_ubuf and vhost_zcopy

2013-05-06T10:25:47+00:00

- Rename vhost_ubuf to vhost_net_ubuf
- Rename vhost_zcopy_mask to vhost_net_zcopy_mask
- Make funcs static

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin

vhost: Remove vhost_enable_zcopy in vhost.h

2013-05-06T10:21:15+00:00

It is net.c specific.

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin

vhost: Remove comments for hdr in vhost.h

2013-05-06T10:21:07+00:00

It is supposed to be removed when hdr is moved into vhost_net_virtqueue.

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin

vhost: Move VHOST_NET_FEATURES to net.c

2013-05-06T10:21:00+00:00

vhost.h should not depend on device specific marcos like
VHOST_NET_F_VIRTIO_NET_HDR and VIRTIO_NET_F_MRG_RXBUF.

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin

vhost-net: Free ubuf when vhost_dev_set_owner fails

2013-05-06T09:57:54+00:00

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin

vhost: Export vhost_dev_set_owner

2013-05-06T09:57:54+00:00

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin