* [Qemu-devel] [PATCH] vhost-net: disable mergeable buffers
@ 2010-04-04 14:36 Michael S. Tsirkin
2010-04-13 22:02 ` Aurelien Jarno
0 siblings, 1 reply; 2+ messages in thread
From: Michael S. Tsirkin @ 2010-04-04 14:36 UTC (permalink / raw)
To: qemu-devel, 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 <mst@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] vhost-net: disable mergeable buffers
2010-04-04 14:36 [Qemu-devel] [PATCH] vhost-net: disable mergeable buffers Michael S. Tsirkin
@ 2010-04-13 22:02 ` Aurelien Jarno
0 siblings, 0 replies; 2+ messages in thread
From: Aurelien Jarno @ 2010-04-13 22:02 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel
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
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-13 22:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-04 14:36 [Qemu-devel] [PATCH] vhost-net: disable mergeable buffers Michael S. Tsirkin
2010-04-13 22:02 ` Aurelien Jarno
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.