aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2014-09-03 14:25:30 +0800
committerMichael S. Tsirkin <mst@redhat.com>2014-09-03 16:41:05 +0300
commitb49ae9138d5cadb47fb868297fbcdac8292fb666 (patch)
treebce4155090b858c6a29a27c51b472c64189f47ba
parentcd7d1d26b0a333bf2fca715e332690bbd738c097 (diff)
downloadqemu-b49ae9138d5cadb47fb868297fbcdac8292fb666.zip
qemu-b49ae9138d5cadb47fb868297fbcdac8292fb666.tar.gz
qemu-b49ae9138d5cadb47fb868297fbcdac8292fb666.tar.bz2
vhost_net: init acked_features to backend_features
commit 2e6d46d77ed328d34a94688da8371bcbe243479b (vhost: add vhost_get_features and vhost_ack_features) removes the step that initializes the acked_features to backend_features. As this field is now uninitialized, vhost initialization will sometimes fail. To fix, initialize acked_features on each ack. Tested-by: Andrey Korolyov <andrey@xdel.ru> Cc: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com> Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/net/vhost_net.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 3819044..b21e7a4 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -115,6 +115,7 @@ unsigned vhost_net_get_features(struct vhost_net *net, unsigned features)
void vhost_net_ack_features(struct vhost_net *net, unsigned features)
{
+ net->dev.acked_features = net->dev.backend_features;
vhost_ack_features(&net->dev, vhost_net_get_feature_bits(net), features);
}