summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2015-11-17 16:55:17 +0200
committerMichael S. Tsirkin <mst@redhat.com>2015-11-18 18:49:12 +0200
commit72018d1e1917a56d05e24aedc9f582b7c8385e19 (patch)
tree536ef5757dbce4840a7f0eeb5ade8c6754893fef /hw
parent7ebcfe569211f6ff5402b558b85e2ce1e1066cf6 (diff)
downloadhqemu-72018d1e1917a56d05e24aedc9f582b7c8385e19.zip
hqemu-72018d1e1917a56d05e24aedc9f582b7c8385e19.tar.gz
vhost-user: ignore qemu-only features
Some features (such as ctrl vq) are supported by qemu without need to communicate with the backend. Drop them from the feature mask so we set them unconditionally. Reported-by: Victor Kaplansky <vkaplans@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/net/vhost_net.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 14337a4..318c3e6 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -77,14 +77,8 @@ static const int user_feature_bits[] = {
VIRTIO_NET_F_HOST_ECN,
VIRTIO_NET_F_HOST_UFO,
VIRTIO_NET_F_MRG_RXBUF,
- VIRTIO_NET_F_STATUS,
- VIRTIO_NET_F_CTRL_VQ,
- VIRTIO_NET_F_CTRL_RX,
- VIRTIO_NET_F_CTRL_VLAN,
- VIRTIO_NET_F_CTRL_RX_EXTRA,
- VIRTIO_NET_F_CTRL_MAC_ADDR,
- VIRTIO_NET_F_CTRL_GUEST_OFFLOADS,
+ /* This bit implies RARP isn't sent by QEMU out of band */
VIRTIO_NET_F_GUEST_ANNOUNCE,
VIRTIO_NET_F_MQ,
OpenPOWER on IntegriCloud