From af4c828e7043b2c594f904bca419fd3ab2b80a38 Mon Sep 17 00:00:00 2001 From: David L Stevens Date: Wed, 31 Mar 2010 21:20:31 +0300 Subject: [PATCH] vhost: fix features ack vhost driver in qemu didn't ack features, and this happens to work because we don't really require any features. However, it's better not to rely on this. This patch passes features to vhost as guest acks them. Signed-off-by: David L Stevens Signed-off-by: Michael S. Tsirkin --- hw/virtio-net.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 970ba06275..acb3cec7cb 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -219,6 +219,14 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features) (features >> VIRTIO_NET_F_GUEST_ECN) & 1, (features >> VIRTIO_NET_F_GUEST_UFO) & 1); } + if (!n->nic->nc.peer || + n->nic->nc.peer->info->type != NET_CLIENT_TYPE_TAP) { + return; + } + if (!tap_get_vhost_net(n->nic->nc.peer)) { + return; + } + return vhost_net_ack_features(tap_get_vhost_net(n->nic->nc.peer), features); } static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd, -- 2.11.4.GIT