From 5751995a20e77cd9d61d00f7390401895fa172a6 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Sun, 4 Apr 2010 17:36:55 +0300 Subject: [PATCH] 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 Signed-off-by: Aurelien Jarno --- hw/vhost_net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/vhost_net.c b/hw/vhost_net.c index 39643f1e99..2e292eea26 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; } -- 2.11.0