From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NyR0E-0000Q8-0d for qemu-devel@nongnu.org; Sun, 04 Apr 2010 10:40:42 -0400 Received: from [140.186.70.92] (port=47588 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NyR0B-0000Q0-Pn for qemu-devel@nongnu.org; Sun, 04 Apr 2010 10:40:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NyR0A-0004RK-Eh for qemu-devel@nongnu.org; Sun, 04 Apr 2010 10:40:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48501) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NyR0A-0004R1-5M for qemu-devel@nongnu.org; Sun, 04 Apr 2010 10:40:38 -0400 Date: Sun, 4 Apr 2010 17:36:55 +0300 From: "Michael S. Tsirkin" Message-ID: <20100404143655.GA7731@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] vhost-net: disable mergeable buffers List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori 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 --- 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