[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 28/50] ivshmem: fix pci_ivshmem_exit()
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v2 28/50] ivshmem: fix pci_ivshmem_exit() |
Date: |
Mon, 12 Oct 2015 18:41:22 +0200 |
From: Marc-André Lureau <address@hidden>
Free all objects owned by the device, making sure the device is free,
fixing hot-unplug.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Claudio Fontana <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 7be3d5e..d1b5d35 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -800,15 +800,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] [PULL v2 24/50] ivshmem: migrate with VMStateDescription, (continued)
- [Qemu-devel] [PULL v2 24/50] ivshmem: migrate with VMStateDescription, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 25/50] ivshmem: shmfd can be 0, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 19/50] ivshmem: improve error handling, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 27/50] ivshmem: add device description, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 30/50] ivshmem: error on too many eventfd received, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 35/50] ivshmem-server: fix hugetlbfs support, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 36/50] docs: update ivshmem device spec, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 46/50] ivshmem: remove EventfdEntry.vector, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 45/50] ivshmem: add hostmem backend, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 43/50] ivshmem: do not keep shm_fd open, marcandre . lureau, 2015/10/15
- [Qemu-devel] [PULL v2 28/50] ivshmem: fix pci_ivshmem_exit(),
marcandre . lureau <=