[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 40/45] ivshmem: do not keep shm_fd open
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 40/45] ivshmem: do not keep shm_fd open |
Date: |
Tue, 28 Jul 2015 02:32:52 +0200 |
From: Marc-André Lureau <address@hidden>
Remove shm_fd from device state, closing it as early as possible to avoid leaks.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/misc/ivshmem.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 3dabcdd..b85fcd4 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -88,7 +88,6 @@ typedef struct IVShmemState {
MemoryRegion ivshmem;
uint64_t ivshmem_size; /* size of shared memory region */
uint32_t ivshmem_64bit;
- int shm_fd; /* shared memory file descriptor */
Peer *peers;
int nb_peers; /* how many peers we have space for */
@@ -235,7 +234,7 @@ static uint64_t ivshmem_io_read(void *opaque, hwaddr addr,
case IVPOSITION:
/* return my VM ID if the memory is mapped */
- if (s->shm_fd >= 0) {
+ if (memory_region_is_mapped(&s->ivshmem)) {
ret = s->vm_id;
} else {
ret = -1;
@@ -357,8 +356,6 @@ static int create_shared_memory_BAR(IVShmemState *s, int
fd, uint8_t attr,
return -1;
}
- s->shm_fd = fd;
-
memory_region_init_ram_ptr(&s->ivshmem, OBJECT(s), "ivshmem.bar2",
s->ivshmem_size, ptr);
vmstate_register_ram(&s->ivshmem, DEVICE(s));
@@ -536,7 +533,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf,
int size)
if (incoming_posn == -1) {
void * map_ptr;
- if (s->shm_fd >= 0) {
+ if (memory_region_is_mapped(&s->ivshmem)) {
error_report("shm already initialized");
close(incoming_fd);
return;
@@ -565,9 +562,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf,
int size)
memory_region_add_subregion(&s->bar, 0, &s->ivshmem);
- /* only store the fd if it is successfully mapped */
- s->shm_fd = incoming_fd;
-
+ close(incoming_fd);
return;
}
@@ -828,6 +823,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
**errp)
}
create_shared_memory_BAR(s, fd, attr, errp);
+ close(fd);
}
}
@@ -843,7 +839,7 @@ static void pci_ivshmem_exit(PCIDevice *dev)
error_free(s->migration_blocker);
}
- if (s->shm_fd >= 0) {
+ if (memory_region_is_mapped(&s->ivshmem)) {
void *addr = memory_region_get_ram_ptr(&s->ivshmem);
vmstate_unregister_ram(&s->ivshmem, DEVICE(dev));
--
2.4.3
- [Qemu-devel] [PATCH v2 30/45] contrib: add ivshmem client and server, (continued)
- [Qemu-devel] [PATCH v2 30/45] contrib: add ivshmem client and server, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 33/45] ivshmem-server: fix hugetlbfs support, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 34/45] docs: update ivshmem device spec, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 35/45] ivshmem: add check on protocol version in QEMU, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 36/45] contrib: remove unnecessary strdup(), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 37/45] msix: implement pba write (but read-only), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 38/45] qtest: add qtest_add_abrt_handler(), Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 39/45] tests: add ivshmem qtest, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 40/45] ivshmem: do not keep shm_fd open,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 41/45] ivshmem: rename ivshmem_get_size/parse_mem_size, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 42/45] ivshmem: add hostmem backend, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 43/45] ivshmem: remove EventfdEntry.vector, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 44/45] ivshmem: rename MSI eventfd_table, Marc-André Lureau, 2015/07/27
- [Qemu-devel] [PATCH v2 45/45] ivshmem: use kvm irqfd for msi notifications, Marc-André Lureau, 2015/07/27