Patchwork vhost-net: disable mergeable buffers

login
register
mail settings
Submitter Michael S. Tsirkin
Date April 4, 2010, 2:36 p.m.
Message ID <20100404143655.GA7731@redhat.com>
Download mbox | patch
Permalink /patch/49354/
State New
Headers show

Comments

Michael S. Tsirkin - April 4, 2010, 2:36 p.m.
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>
---
 hw/vhost_net.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Aurelien Jarno - April 13, 2010, 10:02 p.m.
On Sun, Apr 04, 2010 at 05:36:55PM +0300, Michael S. Tsirkin wrote:
> 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>

Thanks, applied.

> ---
>  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
> 
> 
>

Patch

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;
 }