Skip to contentSkip to conversation

vhost-net: disable mergeable buffers

PATCH Applied Michael S. Tsirkin 2 participants 2 messages Apr 4, 2010 – Apr 13, 2010

lore
Share & tools
lore

Michael S. Tsirkin

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 hw/vhost_net.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
hw/vhost_net.c +1 -0
index 39643f1..2e292ee 100644
@@ -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;
 }
Signature · 1 line
1.7.0.2.280.gc6f05
Applied
#1 lore raw
Quoted 5 lines · 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 <[email protected]>

Thanks, applied.

Quoted 21 lines
---
 hw/vhost_net.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
hw/vhost_net.c +1 -0
index 39643f1..2e292ee 100644
@@ -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;
 }
Signature · 1 line
1.7.0.2.280.gc6f05
Signature · 2 lines
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net