diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-04-04 17:36:55 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-04-11 20:15:55 +0300 |
| commit | c6b35ac4c47290561b072a34f7bf1fdbc540a4a3 (patch) | |
| tree | fd7f1481e37e3d98d9f70a209fcaaa501e3cefed | |
| parent | af4c828e7043b2c594f904bca419fd3ab2b80a38 (diff) | |
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 <mst@redhat.com>
| -rw-r--r-- | 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 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; } |