[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/40] ivshmem: Clean up after commit 9940c32
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 13/40] ivshmem: Clean up after commit 9940c32 |
Date: |
Fri, 18 Mar 2016 18:01:00 +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 20/40] ivshmem: Leave INTx alone when using MSI-X, (continued)
- [Qemu-devel] [PULL 20/40] ivshmem: Leave INTx alone when using MSI-X, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 39/40] ivshmem: Require master to have ID zero, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 33/40] ivshmem: Inline check_shm_size() into its only caller, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 26/40] ivshmem: Propagate errors through ivshmem_recv_setup(), Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 10/40] ivshmem: Rewrite specification document, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 32/40] ivshmem: Simplify memory regions for BAR 2 (shared memory), Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 04/40] qemu-doc: Fix ivshmem huge page example, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 29/40] ivshmem: Simplify how we cope with short reads from server, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 19/40] ivshmem: Clean up MSI-X conditions, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 35/40] ivshmem: Replace int role_val by OnOffAuto master, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 13/40] ivshmem: Clean up after commit 9940c32,
Markus Armbruster <=
- [Qemu-devel] [PULL 02/40] ivshmem-server: Fix and clean up command line help, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 23/40] ivshmem: Disentangle ivshmem_read(), Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 16/40] ivshmem: Fix harmless misuse of Error, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 17/40] ivshmem: Failed realize() can leave migration blocker behind, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 25/40] ivshmem: Receive shared memory synchronously in realize(), Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 30/40] ivshmem: Tighten check of property "size", Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 27/40] ivshmem: Rely on server sending the ID right after the version, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 37/40] ivshmem: Clean up after the previous commit, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 28/40] ivshmem: Drop the hackish test for UNIX domain chardev, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 31/40] ivshmem: Implement shm=... with a memory backend, Markus Armbruster, 2016/03/18