[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 022/142] contrib/ivshmem: convert to meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 022/142] contrib/ivshmem: convert to meson |
Date: |
Tue, 28 Jan 2020 18:51:42 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 9 ---------
Makefile.objs | 2 --
configure | 3 ---
contrib/ivshmem-client/Makefile.objs | 1 -
contrib/ivshmem-client/meson.build | 3 +++
contrib/ivshmem-server/Makefile.objs | 1 -
contrib/ivshmem-server/meson.build | 3 +++
meson.build | 6 ++++++
8 files changed, 12 insertions(+), 16 deletions(-)
delete mode 100644 contrib/ivshmem-client/Makefile.objs
create mode 100644 contrib/ivshmem-client/meson.build
delete mode 100644 contrib/ivshmem-server/Makefile.objs
create mode 100644 contrib/ivshmem-server/meson.build
diff --git a/Makefile b/Makefile
index 5c000b2a2f..c0e62d8053 100644
--- a/Makefile
+++ b/Makefile
@@ -286,8 +286,6 @@ dummy := $(call unnest-vars,, \
chardev-obj-y \
qga-obj-y \
elf2dmp-obj-y \
- ivshmem-client-obj-y \
- ivshmem-server-obj-y \
qga-vss-dll-obj-y \
block-obj-y \
block-obj-m \
@@ -488,13 +486,6 @@ endif
elf2dmp$(EXESUF): $(elf2dmp-obj-y)
$(call LINK, $^)
-ifdef CONFIG_IVSHMEM
-ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
- $(call LINK, $^)
-ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
- $(call LINK, $^)
-endif
-
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \
diff --git a/Makefile.objs b/Makefile.objs
index 2f375be444..92dc309fd7 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -106,7 +106,5 @@ qga-vss-dll-obj-y = qga/
######################################################################
# contrib
elf2dmp-obj-y = contrib/elf2dmp/
-ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
-ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
######################################################################
diff --git a/configure b/configure
index a650183ff6..52269b4ca6 100755
--- a/configure
+++ b/configure
@@ -6209,9 +6209,6 @@ if test "$want_tools" = "yes" ; then
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-nbd\$(EXESUF) $tools"
fi
- if [ "$ivshmem" = "yes" ]; then
- tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
- fi
if [ "$curl" = "yes" ]; then
tools="elf2dmp\$(EXESUF) $tools"
fi
diff --git a/contrib/ivshmem-client/Makefile.objs
b/contrib/ivshmem-client/Makefile.objs
deleted file mode 100644
index bfab2d20dd..0000000000
--- a/contrib/ivshmem-client/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-ivshmem-client-obj-y = ivshmem-client.o main.o
diff --git a/contrib/ivshmem-client/meson.build
b/contrib/ivshmem-client/meson.build
new file mode 100644
index 0000000000..92ad844a9c
--- /dev/null
+++ b/contrib/ivshmem-client/meson.build
@@ -0,0 +1,3 @@
+executable('ivshmem-client', files('ivshmem-client.c', 'main.c'),
+ dependencies: glib,
+ install: true)
diff --git a/contrib/ivshmem-server/Makefile.objs
b/contrib/ivshmem-server/Makefile.objs
deleted file mode 100644
index c060dd3698..0000000000
--- a/contrib/ivshmem-server/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-ivshmem-server-obj-y = ivshmem-server.o main.o
diff --git a/contrib/ivshmem-server/meson.build
b/contrib/ivshmem-server/meson.build
new file mode 100644
index 0000000000..6dbe240df6
--- /dev/null
+++ b/contrib/ivshmem-server/meson.build
@@ -0,0 +1,3 @@
+executable('ivshmem-server', files('ivshmem-server.c', 'main.c'),
+ dependencies: [qemuutil, rt],
+ install: true)
diff --git a/meson.build b/meson.build
index 6613eae7e2..53e453026c 100644
--- a/meson.build
+++ b/meson.build
@@ -54,6 +54,7 @@ if 'CONFIG_GNUTLS' in config_host
endif
pixman = declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].split(),
link_args: config_host['PIXMAN_LIBS'].split())
+rt = cc.find_library('rt', required: false)
libiscsi = declare_dependency()
if 'CONFIG_LIBISCSI' in config_host
libiscsi = declare_dependency(compile_args:
config_host['LIBISCSI_CFLAGS'].split(),
@@ -219,4 +220,9 @@ if have_tools
subdir('contrib/vhost-user-input')
subdir('contrib/vhost-user-scsi')
endif
+
+ if 'CONFIG_IVSHMEM' in config_host
+ subdir('contrib/ivshmem-client')
+ subdir('contrib/ivshmem-server')
+ endif
endif
--
2.21.0
- [PATCH 012/142] meson: add testsuite Makefile generator, (continued)
- [PATCH 012/142] meson: add testsuite Makefile generator, Paolo Bonzini, 2020/01/28
- [PATCH 014/142] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2020/01/28
- [PATCH 016/142] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 015/142] meson: add version.o, Paolo Bonzini, 2020/01/28
- [PATCH 017/142] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 018/142] contrib/vhost-user-scsi: convert to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 019/142] contrib/rdmacm-mux: convert to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 020/142] contrib/vhost-user-input: convert to meson, Paolo Bonzini, 2020/01/28
- [PATCH 013/142] libqemuutil: convert to meson, Paolo Bonzini, 2020/01/28
- [PATCH 021/142] contrib/vhost-user-gpu: convert to meson, Paolo Bonzini, 2020/01/28
- [PATCH 022/142] contrib/ivshmem: convert to meson,
Paolo Bonzini <=
- [PATCH 023/142] contrib/elf2dmp: convert to meson, Paolo Bonzini, 2020/01/28
- [PATCH 024/142] meson: convert qemu-ga, Paolo Bonzini, 2020/01/28
- [PATCH 025/142] meson: convert vss-win32, Paolo Bonzini, 2020/01/28
- [PATCH 026/142] meson: add msi generation, Paolo Bonzini, 2020/01/28
- [PATCH 027/142] meson: convert dummy Windows qga/qemu-ga target, Paolo Bonzini, 2020/01/28
- [PATCH 028/142] meson: add qemu-bridge-helper, Paolo Bonzini, 2020/01/28
- [PATCH 029/142] meson: add qemu-keymap, Paolo Bonzini, 2020/01/28
- [PATCH 030/142] meson: add qemu-edid, Paolo Bonzini, 2020/01/28
- [PATCH 031/142] meson: add virtfs-proxy-helper, Paolo Bonzini, 2020/01/28
- [PATCH 032/142] meson: keymap-gen, Paolo Bonzini, 2020/01/28