diff options
| author | Paolo Bonzini | 2012-10-31 10:42:51 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2012-10-31 10:42:51 +0100 |
| commit | f563a5d7a820424756f358e747238f03e866838a (patch) | |
| tree | f78fa474b1933bd395af401a6d745150f4ecd15e /hw/vhost_net.c | |
| parent | raw-win32: implement native asynchronous I/O (diff) | |
| parent | tap-win32: stubs to fix win32 build (diff) | |
| download | qemu-f563a5d7a820424756f358e747238f03e866838a.tar.gz qemu-f563a5d7a820424756f358e747238f03e866838a.tar.xz qemu-f563a5d7a820424756f358e747238f03e866838a.zip | |
Merge remote-tracking branch 'origin/master' into threadpool
Signed-off-by: Paolo Bonzini <pbonzini@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 df2c4a30a2..8241601539 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 |