diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2012-09-24 21:05:03 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2012-10-29 18:25:23 +0200 |
| commit | ff3a8066e651230d255e6eea340e2d48e7da4aeb (patch) | |
| tree | 0283914ee59ad2cd61ea53694d1b467109dcdc5f /hw/vhost_net.c | |
| parent | 6e371ab867d48c16e6a9ee32cefcea48692a4deb (diff) | |
| download | qemu-ff3a8066e651230d255e6eea340e2d48e7da4aeb.zip qemu-ff3a8066e651230d255e6eea340e2d48e7da4aeb.tar.gz qemu-ff3a8066e651230d255e6eea340e2d48e7da4aeb.tar.bz2 | |
virtio-net: enable mrg buf header in tap on linux
Modern linux supports arbitrary header size,
which makes it possible to pass mrg buf header
to tap directly without iovec mangling.
Use this capability when it is there.
This removes the need to deal with it in
vhost-net as we do now.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/vhost_net.c')
| -rw-r--r-- | hw/vhost_net.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/hw/vhost_net.c b/hw/vhost_net.c index df2c4a3..8241601 100644 --- a/hw/vhost_net.c +++ b/hw/vhost_net.c @@ -150,10 +150,6 @@ int vhost_net_start(struct vhost_net *net, if (r < 0) { goto fail_notifiers; } - if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) { - tap_set_vnet_hdr_len(net->nc, - sizeof(struct virtio_net_hdr_mrg_rxbuf)); - } r = vhost_dev_start(&net->dev, dev); if (r < 0) { @@ -179,9 +175,6 @@ fail: } net->nc->info->poll(net->nc, true); vhost_dev_stop(&net->dev, dev); - if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) { - tap_set_vnet_hdr_len(net->nc, sizeof(struct virtio_net_hdr)); - } fail_start: vhost_dev_disable_notifiers(&net->dev, dev); fail_notifiers: @@ -199,18 +192,12 @@ void vhost_net_stop(struct vhost_net *net, } net->nc->info->poll(net->nc, true); vhost_dev_stop(&net->dev, dev); - if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) { - tap_set_vnet_hdr_len(net->nc, sizeof(struct virtio_net_hdr)); - } vhost_dev_disable_notifiers(&net->dev, dev); } void vhost_net_cleanup(struct vhost_net *net) { vhost_dev_cleanup(&net->dev); - if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) { - tap_set_vnet_hdr_len(net->nc, sizeof(struct virtio_net_hdr)); - } g_free(net); } #else |