aboutsummaryrefslogtreecommitdiff
path: root/net/vhost-user.c
diff options
context:
space:
mode:
authorhaibinzhang(张海斌) <haibinzhang@tencent.com>2020-09-22 03:27:54 +0000
committerMichael S. Tsirkin <mst@redhat.com>2020-09-29 03:06:12 -0400
commitf66337bdbfdae6a288f37dcfba3748ee0015510d (patch)
tree29a55c02962e2c7c3a8d5a044e92ef93a2d8fb9b /net/vhost-user.c
parent48a7ff4d516c92323ca7bd88df90ebb974bc0a9a (diff)
downloadqemu-f66337bdbfdae6a288f37dcfba3748ee0015510d.zip
qemu-f66337bdbfdae6a288f37dcfba3748ee0015510d.tar.gz
qemu-f66337bdbfdae6a288f37dcfba3748ee0015510d.tar.bz2
vhost-user: save features of multiqueues if chardev is closed
Fore-commit(c6beefd674) only saves features of queue0, this makes wrong features of other queues in multiqueues situation. For examples: qemu-system-aarch64 ... \ -chardev socket,id=charnet0,path=/var/run/vhost_sock \ -netdev vhost-user,chardev=charnet0,queues=2,id=hostnet0 \ ... There are two queues in nic assocated with one chardev. When chardev is reconnected, it is necessary to save and restore features of all queues. Signed-of-by: Haibin Zhang <haibinzhang@tencent.com> Message-Id: <46CBC206-E0CA-4249-81CD-10F75DA30441@tencent.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'net/vhost-user.c')
-rw-r--r--net/vhost-user.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/net/vhost-user.c b/net/vhost-user.c
index 17532da..ffbd94d 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -226,7 +226,7 @@ static void chr_closed_bh(void *opaque)
NetClientState *ncs[MAX_QUEUE_NUM];
NetVhostUserState *s;
Error *err = NULL;
- int queues;
+ int queues, i;
queues = qemu_find_net_clients_except(name, ncs,
NET_CLIENT_DRIVER_NIC,
@@ -235,8 +235,12 @@ static void chr_closed_bh(void *opaque)
s = DO_UPCAST(NetVhostUserState, nc, ncs[0]);
- if (s->vhost_net) {
- s->acked_features = vhost_net_get_acked_features(s->vhost_net);
+ for (i = queues -1; i >= 0; i--) {
+ s = DO_UPCAST(NetVhostUserState, nc, ncs[i]);
+
+ if (s->vhost_net) {
+ s->acked_features = vhost_net_get_acked_features(s->vhost_net);
+ }
}
qmp_set_link(name, false, &err);