diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-04-04 17:36:55 +0300 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-04-13 23:59:49 +0200 |
| commit | 5751995a20e77cd9d61d00f7390401895fa172a6 (patch) | |
| tree | b490a19cf450dfdde0ad8404d7ff654b1657a918 /hw/vhost_net.c | |
| parent | dc14a397812b91dd0d48b03d1b8f66a251542369 (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>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/vhost_net.c')
| -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; } |