From: Michael S. Tsirkin <mst@redhat.com>
Date: Sun, 4 Apr 2010 14:36:55 +0000 (+0300)
Subject: vhost-net: disable mergeable buffers
X-Git-Tag: v0.13.0-rc0~806
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5751995a20e77cd9d61d00f7390401895fa172a6;p=thirdparty%2Fqemu.git

vhost-net: disable mergeable buffers

vhost in current kernels doesn't support mergeable buffers.
Disable this feature if vhost is enabled, until such
support is implemented.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/hw/vhost_net.c b/hw/vhost_net.c
index 39643f1e992..2e292eea260 100644
--- a/hw/vhost_net.c
+++ b/hw/vhost_net.c
@@ -51,6 +51,7 @@ unsigned vhost_net_get_features(struct vhost_net *net, unsigned features)
     if (!(net->dev.features & (1 << VIRTIO_RING_F_INDIRECT_DESC))) {
         features &= ~(1 << VIRTIO_RING_F_INDIRECT_DESC);
     }
+    features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF);
     return features;
 }