From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai6gM-0000IH-Tm for qemu-devel@nongnu.org; Mon, 21 Mar 2016 16:44:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai6gK-0000ic-MZ for qemu-devel@nongnu.org; Mon, 21 Mar 2016 16:44:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai6gK-0000iL-HM for qemu-devel@nongnu.org; Mon, 21 Mar 2016 16:44:08 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 29FD68B137 for ; Mon, 21 Mar 2016 20:44:08 +0000 (UTC) From: Markus Armbruster Date: Mon, 21 Mar 2016 21:43:28 +0100 Message-Id: <1458593043-31731-6-git-send-email-armbru@redhat.com> In-Reply-To: <1458593043-31731-1-git-send-email-armbru@redhat.com> References: <1458593043-31731-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL v2 05/40] event_notifier: Make event_notifier_init_fd() #ifdef CONFIG_EVENTFD List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini 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 Signed-off-by: Markus Armbruster Reviewed-by: Paolo Bonzini Message-Id: <1458066895-20632-6-git-send-email-armbru@redhat.com> --- default-configs/pci.mak | 2 +- tests/Makefile | 2 +- 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 4fa9a28..9c8bc68 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 cd4bbd4..3cb951d 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 2e30e74..c9657a6 100644 --- a/util/event_notifier-posix.c +++ b/util/event_notifier-posix.c @@ -20,11 +20,17 @@ #include #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) { -- 2.4.3