[Qemu-devel] [PATCH] vhost-net: disable mergeable buffers

[Michael S. Tsirkin]

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 <address@hidden>
---
 hw/vhost_net.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/vhost_net.c b/hw/vhost_net.c
index 39643f1..2e292ee 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;
 }
 
-- 
1.7.0.2.280.gc6f05