From 57fa9fb4efa5aa3382045db2a1970279d49e63f5 Mon Sep 17 00:00:00 2001 From: Cam Macdonell Date: Mon, 27 Aug 2012 12:12:19 -0600 Subject: ivshmem: remove redundant ioeventfd configuration setup_ioeventfds() is unnecessary and actually causes a segfault when used ioeventfd=on is used on the command-line. Since ioeventfds are handled within the memory API, it can be removed. Signed-off-by: Cam Macdonell Signed-off-by: Anthony Liguori (cherry picked from commit 7e7de876ae9bdb1b994dee148c6dc009ce94c48e) Conflicts: hw/ivshmem.c Signed-off-by: Michael Roth --- hw/ivshmem.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/hw/ivshmem.c b/hw/ivshmem.c index 36005618b..e20c688bd 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -367,22 +367,6 @@ static void close_guest_eventfds(IVShmemState *s, int posn) s->peers[posn].nb_eventfds = 0; } -static void setup_ioeventfds(IVShmemState *s) { - - int i, j; - - for (i = 0; i <= s->max_peer; i++) { - for (j = 0; j < s->peers[i].nb_eventfds; j++) { - memory_region_add_eventfd(&s->ivshmem_mmio, - DOORBELL, - 4, - true, - (i << 16) | j, - s->peers[i].eventfds[j]); - } - } -} - /* this function increase the dynamic storage need to store data about other * guests */ static void increase_dynamic_storage(IVShmemState *s, int new_min_size) { @@ -689,10 +673,6 @@ static int pci_ivshmem_init(PCIDevice *dev) memory_region_init_io(&s->ivshmem_mmio, &ivshmem_mmio_ops, s, "ivshmem-mmio", IVSHMEM_REG_BAR_SIZE); - if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) { - setup_ioeventfds(s); - } - /* region for registers*/ pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ivshmem_mmio); -- cgit v1.2.3