Commit d8e80ae3 authored Sep 11, 2014 by Damjan Marion Committed by Michael S. Tsirkin Sep 18, 2014

vhost-user: fix VIRTIO_NET_F_MRG_RXBUF negotiation



Header length check should happen only if backend is kernel. For user
backend there is no reason to reset this bit.

vhost-user code does not define .has_vnet_hdr_len so
VIRTIO_NET_F_MRG_RXBUF cannot be negotiated even if both sides
support it.

Signed-off-by: Damjan Marion <damarion@cisco.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent e43c0b2e

hw/net/vhost_net.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -163,11 +163,11 @@ struct vhost_net vhost_net_init(VhostNetOptions options)
		if (r < 0) {
		goto fail;
		}
		if (backend_kernel) {
		if (!qemu_has_vnet_hdr_len(options->net_backend,
		sizeof(struct virtio_net_hdr_mrg_rxbuf))) {
		net->dev.features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF);
		}
		if (backend_kernel) {
		if (~net->dev.features & net->dev.backend_features) {
		fprintf(stderr, "vhost lacks feature mask %" PRIu64
		" for backend\n",