mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vhost-user: save features of multiqueues if chardev is closed

Browse Source 
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>
This commit is contained in:
haibinzhang(张海斌) 2020-09-22 03:27:54 +00:00 committed by Michael S. Tsirkin
parent 48a7ff4d51
commit f66337bdbf
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/vhost-user.c
View File

@ -226,7 +226,7 @@ static void chr_closed_bh(void *opaque)
NetClientState *ncs[MAX_QUEUE_NUM]; NetClientState *ncs[MAX_QUEUE_NUM];
NetVhostUserState *s; NetVhostUserState *s;
Error *err = NULL; Error *err = NULL;
int queues; int queues, i;
queues = qemu_find_net_clients_except(name, ncs, queues = qemu_find_net_clients_except(name, ncs,
NET_CLIENT_DRIVER_NIC, NET_CLIENT_DRIVER_NIC,
@ -235,8 +235,12 @@ static void chr_closed_bh(void *opaque)
s = DO_UPCAST(NetVhostUserState, nc, ncs[0]); s = DO_UPCAST(NetVhostUserState, nc, ncs[0]);
if (s->vhost_net) { for (i = queues -1; i >= 0; i--) {
s->acked_features = vhost_net_get_acked_features(s->vhost_net); 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); qmp_set_link(name, false, &err);