From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XP40l-00078z-Mg for qemu-devel@nongnu.org; Wed, 03 Sep 2014 02:25:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XP40h-0002T1-G5 for qemu-devel@nongnu.org; Wed, 03 Sep 2014 02:25:43 -0400 From: Jason Wang Date: Wed, 3 Sep 2014 14:25:30 +0800 Message-Id: <1409725530-1425-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PATCH] vhost_net: initialize acked_features to a safe value during ack List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com, qemu-devel@nongnu.org Cc: Jason Wang , Andrey Korolyov , Michael Roth , Nikolay Nikolaev , qemu-stable@nongnu.org commit 2e6d46d77ed328d34a94688da8371bcbe243479b (vhost: add vhost_get_features and vhost_ack_features) removes the step that initializes the acked_features to backend_features. This will result an unexpected value of acked_features which may fail the features setting of vhost. This patch fixes it by recover this step. Cc: Nikolay Nikolaev Cc: Andrey Korolyov Cc: Michael S. Tsirkin Cc: Michael Roth Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang --- hw/net/vhost_net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index f87c798..b1d4b1f 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); } -- 1.8.3.1