[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v4 34/48] vhost-user: save features of multiqueues if chardev is c
From: |
Michael S. Tsirkin |
Subject: |
[PULL v4 34/48] vhost-user: save features of multiqueues if chardev is closed |
Date: |
Tue, 29 Sep 2020 03:22:23 -0400 |
From: haibinzhang(张海斌) <haibinzhang@tencent.com>
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>
---
net/vhost-user.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/net/vhost-user.c b/net/vhost-user.c
index 17532daaf3..ffbd94d944 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);
--
MST
- [PULL v4 22/48] x86: cpuhp: prevent guest crash on CPU hotplug when broadcast SMI is in use, (continued)
- [PULL v4 22/48] x86: cpuhp: prevent guest crash on CPU hotplug when broadcast SMI is in use, Michael S. Tsirkin, 2020/09/29
- [PULL v4 21/48] x86: lpc9: let firmware negotiate 'CPU hotplug with SMI' features, Michael S. Tsirkin, 2020/09/29
- [PULL v4 24/48] acpi: add aml_land() and aml_break() primitives, Michael S. Tsirkin, 2020/09/29
- [PULL v4 25/48] tests: acpi: mark to be changed tables in bios-tables-test-allowed-diff, Michael S. Tsirkin, 2020/09/29
- [PULL v4 26/48] x86: ich9: expose "smi_negotiated_features" as a QOM property, Michael S. Tsirkin, 2020/09/29
- [PULL v4 27/48] x86: acpi: introduce AcpiPmInfo::smi_on_cpuhp, Michael S. Tsirkin, 2020/09/29
- [PULL v4 28/48] x86: acpi: introduce the PCI0.SMI0 ACPI device, Michael S. Tsirkin, 2020/09/29
- [PULL v4 29/48] x68: acpi: trigger SMI before sending hotplug Notify event to OSPM, Michael S. Tsirkin, 2020/09/29
- [PULL v4 31/48] hw/smbios: support loading OEM strings values from a file, Michael S. Tsirkin, 2020/09/29
- [PULL v4 32/48] hw/smbios: report error if table size is too large, Michael S. Tsirkin, 2020/09/29
- [PULL v4 34/48] vhost-user: save features of multiqueues if chardev is closed,
Michael S. Tsirkin <=
- [PULL v4 35/48] tests/acpi: mark addition of table DSDT.roothp for unit testing root pci hotplug, Michael S. Tsirkin, 2020/09/29
- [PULL v4 33/48] qemu-options: document SMBIOS type 11 settings, Michael S. Tsirkin, 2020/09/29
- [PULL v4 39/48] i440fx/acpi: do not add hotplug related amls for cold plugged bridges, Michael S. Tsirkin, 2020/09/29
- [PULL v4 36/48] tests/acpi: add new unit test to test hotplug off/on feature on the root pci bus, Michael S. Tsirkin, 2020/09/29
- [PULL v4 38/48] Fix a gap where acpi_pcihp_find_hotplug_bus() returns a non-hotpluggable bus, Michael S. Tsirkin, 2020/09/29
- [PULL v4 40/48] tests/acpi: list added acpi table binary file for pci bridge hotplug test, Michael S. Tsirkin, 2020/09/29
- [PULL v4 37/48] tests/acpi: add a new ACPI table in order to test root pci hotplug on/off, Michael S. Tsirkin, 2020/09/29
- [PULL v4 41/48] tests/acpi: unit test for 'acpi-pci-hotplug-with-bridge-support' bridge flag, Michael S. Tsirkin, 2020/09/29
- [PULL v4 42/48] tests/acpi: add newly added acpi DSDT table blob for pci bridge hotplug flag, Michael S. Tsirkin, 2020/09/29
- [PULL v4 44/48] piix4: don't reserve hw resources when hotplug is off globally, Michael S. Tsirkin, 2020/09/29