[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 13/40] ivshmem: Clean up after commit 9940c32
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 13/40] ivshmem: Clean up after commit 9940c32 |
Date: |
Mon, 21 Mar 2016 21:43:36 +0100 |
IVShmemState member eventfd_chr is useless since commit 9940c32. Drop
it.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
---
hw/misc/ivshmem.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 6ac8c0d..9ea79ab 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -79,7 +79,6 @@ typedef struct IVShmemState {
uint32_t intrmask;
uint32_t intrstatus;
- CharDriverState **eventfd_chr;
CharDriverState *server_chr;
Fifo8 incoming_fifo;
MemoryRegion ivshmem_mmio;
@@ -942,8 +941,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
**errp)
pci_register_bar(dev, 2, attr, &s->bar);
- s->eventfd_chr = g_malloc0(s->vectors * sizeof(CharDriverState *));
-
qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive,
ivshmem_check_version, ivshmem_event, s);
} else {
@@ -1007,15 +1004,6 @@ static void pci_ivshmem_exit(PCIDevice *dev)
memory_region_del_subregion(&s->bar, &s->ivshmem);
}
- 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_peer_eventfds(s, i);
--
2.4.3
- [Qemu-devel] [PULL v2 00/40] ivshmem: Fixes, cleanups, device model split, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 12/40] ivshmem: Compile debug prints unconditionally to prevent bit-rot, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 04/40] qemu-doc: Fix ivshmem huge page example, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 13/40] ivshmem: Clean up after commit 9940c32,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 07/40] ivshmem-test: Improve test case /ivshmem/single, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 05/40] event_notifier: Make event_notifier_init_fd() #ifdef CONFIG_EVENTFD, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 02/40] ivshmem-server: Fix and clean up command line help, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 08/40] ivshmem-test: Clean up wait for devices to become operational, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 18/40] ivshmem: Clean up register callbacks, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 17/40] ivshmem: Failed realize() can leave migration blocker behind, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 22/40] ivshmem: Simplify rejection of invalid peer ID from server, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 16/40] ivshmem: Fix harmless misuse of Error, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 34/40] qdev: New DEFINE_PROP_ON_OFF_AUTO, Markus Armbruster, 2016/03/21
- [Qemu-devel] [PULL v2 38/40] ivshmem: Drop ivshmem property x-memdev, Markus Armbruster, 2016/03/21