aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-03-15 19:34:28 +0100
committerMarkus Armbruster <armbru@redhat.com>2016-03-21 21:29:00 +0100
commite64befe929cc4c4a53a79ff469b1b52c210a3468 (patch)
tree0022763bc2f4538034d335805de5b872f14b58f5
parenta4fa93bf20a4be3377df6ac9c9d63cccc31ab68c (diff)
ivshmem: Clean up after commit 9940c32
IVShmemState member eventfd_chr is useless since commit 9940c32. Drop it. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <1458066895-20632-14-git-send-email-armbru@redhat.com>
-rw-r--r--hw/misc/ivshmem.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 6ac8c0d707..9ea79ab01d 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);