aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCam Macdonell <cam@cs.ualberta.ca>2012-08-27 12:12:19 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-08-29 08:23:50 -0500
commit7e7de876ae9bdb1b994dee148c6dc009ce94c48e (patch)
tree7b3d5fd3dbfa0d032f5854525520b7a83da4532a
parent998a74bcda7f3297813732ddc2f28ffe5a12e37a (diff)
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 <cam@cs.ualberta.ca> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/ivshmem.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 47f2a16833..62fe53ae2b 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -385,17 +385,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++) {
- ivshmem_add_eventfd(s, i, 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) {
@@ -696,10 +685,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);