diff options
| author | Markus Armbruster | 2016-03-15 19:34:20 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2016-03-21 21:28:59 +0100 |
| commit | 330b58368ca16c31efdadcf8263f7f903546af50 (patch) | |
| tree | 312ec2338bd7d0b6c2953a2e5dde097a2ee82e7d | |
| parent | qemu-doc: Fix ivshmem huge page example (diff) | |
| download | qemu-330b58368ca16c31efdadcf8263f7f903546af50.tar.gz qemu-330b58368ca16c31efdadcf8263f7f903546af50.tar.xz qemu-330b58368ca16c31efdadcf8263f7f903546af50.zip | |
event_notifier: Make event_notifier_init_fd() #ifdef CONFIG_EVENTFD
Event notifiers are designed for eventfd(2). They can fall back to
pipes, but according to Paolo, event_notifier_init_fd() really
requires the real thing, and should therefore be under #ifdef
CONFIG_EVENTFD. Do that.
Its only user is ivshmem, which is currently CONFIG_POSIX. Narrow it
to CONFIG_EVENTFD.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1458066895-20632-6-git-send-email-armbru@redhat.com>
| -rw-r--r-- | default-configs/pci.mak | 2 | ||||
| -rw-r--r-- | tests/Makefile | 2 | ||||
| -rw-r--r-- | util/event_notifier-posix.c | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 4fa9a28ef6..9c8bc68c4c 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -36,5 +36,5 @@ CONFIG_SDHCI=y CONFIG_EDU=y CONFIG_VGA=y CONFIG_VGA_PCI=y -CONFIG_IVSHMEM=$(CONFIG_POSIX) +CONFIG_IVSHMEM=$(CONFIG_EVENTFD) CONFIG_ROCKER=y diff --git a/tests/Makefile b/tests/Makefile index cd4bbd41ad..3cb951dcc6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -161,7 +161,7 @@ gcov-files-pci-y += hw/display/virtio-gpu-pci.c gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c check-qtest-pci-y += tests/intel-hda-test$(EXESUF) gcov-files-pci-y += hw/audio/intel-hda.c hw/audio/hda-codec.c -check-qtest-pci-$(CONFIG_POSIX) += tests/ivshmem-test$(EXESUF) +check-qtest-pci-$(CONFIG_EVENTFD) += tests/ivshmem-test$(EXESUF) gcov-files-pci-y += hw/misc/ivshmem.c check-qtest-i386-y = tests/endianness-test$(EXESUF) diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c index 2e30e74bd6..c9657a61ae 100644 --- a/util/event_notifier-posix.c +++ b/util/event_notifier-posix.c @@ -20,11 +20,17 @@ #include <sys/eventfd.h> #endif +#ifdef CONFIG_EVENTFD +/* + * Initialize @e with existing file descriptor @fd. + * @fd must be a genuine eventfd object, emulation with pipe won't do. + */ void event_notifier_init_fd(EventNotifier *e, int fd) { e->rfd = fd; e->wfd = fd; } +#endif int event_notifier_init(EventNotifier *e, int active) { |