[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/22] ivshmem-server: ivshmem-client: Build when eve
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 21/22] ivshmem-server: ivshmem-client: Build when eventfd() is available |
Date: |
Sun, 4 Jun 2017 18:45:25 +0300 |
From: Kamil Rytarowski <address@hidden>
Currently ivshmem requires eventfd() which is Linux specific.
Do not and build it unconditionally on every Linux/BSD/Solaris.
This patch indirectly fixes build failure on NetBSD, where these tools
additionally require -lrt for shm_open(3). In future there should be
added support for NetBSD and the linking addressed appropriately.
Signed-off-by: Kamil Rytarowski <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
configure | 2 ++
contrib/ivshmem-client/Makefile.objs | 2 +-
contrib/ivshmem-server/Makefile.objs | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index fbb6a93c99..965727bca8 100755
--- a/configure
+++ b/configure
@@ -4910,6 +4910,8 @@ if test "$want_tools" = "yes" ; then
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) $tools"
+ fi
+ if [ "$eventfd" = "yes" ]; then
tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
fi
fi
diff --git a/contrib/ivshmem-client/Makefile.objs
b/contrib/ivshmem-client/Makefile.objs
index bfab2d20dd..13d864082d 100644
--- a/contrib/ivshmem-client/Makefile.objs
+++ b/contrib/ivshmem-client/Makefile.objs
@@ -1 +1 @@
-ivshmem-client-obj-y = ivshmem-client.o main.o
+ivshmem-client-obj-$(CONFIG_IVSHMEM) = ivshmem-client.o main.o
diff --git a/contrib/ivshmem-server/Makefile.objs
b/contrib/ivshmem-server/Makefile.objs
index c060dd3698..d9469fd777 100644
--- a/contrib/ivshmem-server/Makefile.objs
+++ b/contrib/ivshmem-server/Makefile.objs
@@ -1 +1 @@
-ivshmem-server-obj-y = ivshmem-server.o main.o
+ivshmem-server-obj-$(CONFIG_IVSHMEM) = ivshmem-server.o main.o
--
2.11.0
- [Qemu-devel] [PULL 19/22] ide-test: check return of fwrite, (continued)
- [Qemu-devel] [PULL 19/22] ide-test: check return of fwrite, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 15/22] qapi: Fix some QMP documentation regressions, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 18/22] help: Add newline to end of thread option help text, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 04/22] docs/qdev-device-use.txt: update section Default Devices, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 13/22] register: display register prefix (name) since it is available, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 20/22] dump: fix memory_mapping_filter leak, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 03/22] docs qemu-doc: Avoid ide-drive, it's deprecated, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 16/22] scsi/lsi53c895a: Remove unused lsi_mem_*() return value, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 12/22] hw/sparc: use ARRAY_SIZE() macro, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 06/22] configure: Detect native NetBSD curses(3), Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 21/22] ivshmem-server: ivshmem-client: Build when eventfd() is available,
Michael Tokarev <=
- [Qemu-devel] [PULL 09/22] block: Correct documentation for BLOCK_WRITE_THRESHOLD, Michael Tokarev, 2017/06/04
- Re: [Qemu-devel] [PULL 00/22] Trivial patches for 2017-06-04, Peter Maydell, 2017/06/05