[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/39] ivshmem: fix pci_ivshmem_exit()
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 26/39] ivshmem: fix pci_ivshmem_exit() |
Date: |
Fri, 26 Jun 2015 16:49:32 +0200 |
Free all objects owned by the device, making sure the device is free,
fixing hot-unplug.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/misc/ivshmem.c | 38 +++++++++++++++++++++++++++++++++++---
1 file changed, 35 insertions(+), 3 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 2e9320b..df3bd9d 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -799,15 +799,47 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
**errp)
static void pci_ivshmem_exit(PCIDevice *dev)
{
IVShmemState *s = IVSHMEM(dev);
+ int i;
+
+ fifo8_destroy(&s->incoming_fifo);
if (s->migration_blocker) {
migrate_del_blocker(s->migration_blocker);
error_free(s->migration_blocker);
}
- memory_region_del_subregion(&s->bar, &s->ivshmem);
- vmstate_unregister_ram(&s->ivshmem, DEVICE(dev));
- fifo8_destroy(&s->incoming_fifo);
+ if (s->shm_fd >= 0) {
+ void *addr = memory_region_get_ram_ptr(&s->ivshmem);
+
+ vmstate_unregister_ram(&s->ivshmem, DEVICE(dev));
+ memory_region_del_subregion(&s->bar, &s->ivshmem);
+
+ if (munmap(addr, s->ivshmem_size) == -1) {
+ error_report("Failed to munmap shared memory %s", strerror(errno));
+ }
+ }
+
+ if (s->eventfd_chr) {
+ for (i = 0; i < s->vectors; i++) {
+ if (s->eventfd_chr[i]) {
+ qemu_chr_free(s->eventfd_chr[i]);
+ }
+ }
+ g_free(s->eventfd_chr);
+ }
+
+ if (s->peers) {
+ for (i = 0; i < s->nb_peers; i++) {
+ close_guest_eventfds(s, i);
+ }
+ g_free(s->peers);
+ }
+
+ if (ivshmem_has_feature(s, IVSHMEM_MSI)) {
+ msix_uninit_exclusive_bar(dev);
+ }
+
+ g_free(s->eventfd_table);
}
static bool test_msix(void *opaque, int version_id)
--
2.4.3
- [Qemu-devel] [PATCH 16/39] ivshmem: improve error, (continued)
- [Qemu-devel] [PATCH 16/39] ivshmem: improve error, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 17/39] ivshmem: print error on invalid peer id, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 18/39] ivshmem: add a warning if eventfd value is 0, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 19/39] ivshmem: beautify a bit the code, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 20/39] ivshmem: use common return, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 22/39] ivshmem: migrate with VMStateDescription, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 21/39] ivshmem: use common is_power_of_2(), Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 24/39] ivshmem: check shm isn't already initialized, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 23/39] ivshmem: shmfd can be 0, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 25/39] ivshmem: add device description, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 26/39] ivshmem: fix pci_ivshmem_exit(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH 28/39] ivshmem: error on too many eventfd received, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 27/39] ivshmem: replace 'guest' for 'peer' appropriately, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 29/39] ivshmem: reset mask on device reset, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 31/39] ivshmem-client: check the number of vectors, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 32/39] ivshmem-server: use a uint16 for client ID, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 33/39] ivshmem-server: include necessary headers, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 30/39] contrib: add ivshmem client and server, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 34/39] docs: update ivshmem device spec, Marc-André Lureau, 2015/06/26