OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc14a39
)
vhost-net: disable mergeable buffers
author
Michael S. Tsirkin
<mst@redhat.com>
Sun, 4 Apr 2010 14:36:55 +0000
(17:36 +0300)
committer
Aurelien Jarno
<aurelien@aurel32.net>
Tue, 13 Apr 2010 21:59:49 +0000
(23:59 +0200)
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>
hw/vhost_net.c
patch
|
blob
|
history
diff --git
a/hw/vhost_net.c
b/hw/vhost_net.c
index
39643f1
..
2e292ee
100644
(file)
--- 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;
}