diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-10-20 06:10:51 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-10-20 06:10:51 -0700 |
| commit | afc9fcde55296b83f659de9da3cdf044812a6eeb (patch) | |
| tree | 2b2a3e07632ac570680a7b4f9bd18440a454fd88 /hw/virtio/vhost-user.c | |
| parent | 50352cce138ef3b30c1cda28a4df68fff5da3202 (diff) | |
| parent | a8339e07f94a47f99560baef59d65a9e039aaf45 (diff) | |
| download | focaccia-qemu-afc9fcde55296b83f659de9da3cdf044812a6eeb.tar.gz focaccia-qemu-afc9fcde55296b83f659de9da3cdf044812a6eeb.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc,pci,virtio: features, fixes, tests vhost user rng vdpa multiqueue Fixes, cleanups, new tests all over the place. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Wed 20 Oct 2021 03:18:24 AM PDT # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full] # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full] * remotes/mst/tags/for_upstream: (44 commits) tests/acpi/bios-tables-test: update DSDT blob for multifunction bridge test tests/acpi/pcihp: add unit tests for hotplug on multifunction bridges for q35 tests/acpi/bios-tables-test: add and allow changes to a new q35 DSDT table blob pci: fix PCI resource reserve capability on BE vhost-vdpa: multiqueue support virtio-net: vhost control virtqueue support vhost: record the last virtqueue index for the virtio device virtio-net: use "queue_pairs" instead of "queues" when possible vhost-net: control virtqueue support net: introduce control client vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState * vhost-vdpa: prepare for the multiqueue support vhost-vdpa: classify one time request vhost-vdpa: open device fd in net_init_vhost_vdpa() bios-tables-test: don't disassemble empty files rebuild-expected-aml.sh: allow partial target list qdev/qbus: remove failover specific code vhost-user-blk-test: pass vhost-user socket fds to QSD failover: fix a regression introduced by JSON'ification of -device vhost-user: fix duplicated notifier MR init ... Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/virtio/vhost-user.c')
| -rw-r--r-- | hw/virtio/vhost-user.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 2c8556237f..bf6e50223c 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1526,8 +1526,9 @@ static int vhost_user_slave_handle_vring_host_notifier(struct vhost_dev *dev, name = g_strdup_printf("vhost-user/host-notifier@%p mmaps[%d]", user, queue_idx); - memory_region_init_ram_device_ptr(&n->mr, OBJECT(vdev), name, - page_size, addr); + if (!n->mr.ram) /* Don't init again after suspend. */ + memory_region_init_ram_device_ptr(&n->mr, OBJECT(vdev), name, + page_size, addr); g_free(name); if (virtio_queue_set_host_notifier_mr(vdev, queue_idx, &n->mr, true)) { |