mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib/vhost-user-scsi: convert to Meson

Browse Source 
The libiscsi pkg-config information is extracted from config-host.mak and
used to link vhost-user-blk.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-06-10 12:21:14 +02:00
parent 7af0dbf990
commit 99650b628f
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -312,7 +312,6 @@ dummy := $(call unnest-vars,, \
ivshmem-client-obj-y \ ivshmem-client-obj-y \
ivshmem-server-obj-y \ ivshmem-server-obj-y \
rdmacm-mux-obj-y \ rdmacm-mux-obj-y \
vhost-user-scsi-obj-y \
vhost-user-input-obj-y \ vhost-user-input-obj-y \
vhost-user-gpu-obj-y \ vhost-user-gpu-obj-y \
qga-vss-dll-obj-y \ qga-vss-dll-obj-y \
@ -533,8 +532,6 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
$(call LINK, $^) $(call LINK, $^)
endif endif
vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
rdmacm-mux$(EXESUF): LIBS += "-libumad" rdmacm-mux$(EXESUF): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)

3
Makefile.objs
View File

@ -106,9 +106,6 @@ qga-vss-dll-obj-y = qga/
elf2dmp-obj-y = contrib/elf2dmp/ elf2dmp-obj-y = contrib/elf2dmp/
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
rdmacm-mux-obj-y = contrib/rdmacm-mux/ rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/

1
contrib/vhost-user-scsi/Makefile.objs
View File

@ -1 +0,0 @@
vhost-user-scsi-obj-y = vhost-user-scsi.o

7
contrib/vhost-user-scsi/meson.build Normal file
View File

@ -0,0 +1,7 @@
if 'CONFIG_LIBISCSI' in config_host
executable('vhost-user-scsi', files('vhost-user-scsi.c'),
link_with: libvhost_user,
dependencies: [qemuutil, libiscsi],
build_by_default: targetos == 'linux',
install: false)
endif

6
meson.build
View File

@ -92,6 +92,11 @@ libcap_ng = not_found
if 'CONFIG_LIBCAP_NG' in config_host if 'CONFIG_LIBCAP_NG' in config_host
libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split()) libcap_ng = declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'].split())
endif endif
libiscsi = not_found
if 'CONFIG_LIBISCSI' in config_host
libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(),
link_args: config_host['LIBISCSI_LIBS'].split())
endif
target_dirs = config_host['TARGET_DIRS'].split() target_dirs = config_host['TARGET_DIRS'].split()
have_user = false have_user = false
@ -258,6 +263,7 @@ if have_tools
if 'CONFIG_VHOST_USER' in config_host if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user') subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk') subdir('contrib/vhost-user-blk')
subdir('contrib/vhost-user-scsi')
endif endif
endif endif