openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

meson: add qemu-bridge-helper 

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-07-15 14:39:25 +04:00 committed by Paolo Bonzini
parent 588a19fa9d
commit 8f51e01c01
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -197,8 +197,6 @@ LIBS+=-lz $(LIBS_TOOLS)
HELPERS-y = $(HELPERS) HELPERS-y = $(HELPERS)
HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)
# Sphinx does not allow building manuals into the same directory as # Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must # the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from # build the manuals into a subdirectory (and then install them from
@ -431,8 +429,6 @@ qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io
qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS) qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage-daemon-obj-y) $(COMMON_LDADDS)
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS)
qemu-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS) qemu-keymap$(EXESUF): qemu-keymap.o ui/input-keymap.o $(COMMON_LDADDS)
qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS) qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS)

9
meson.build
View File

@ -297,7 +297,6 @@ qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res) sources: genh + version_res)
# Other build targets # Other build targets
if 'CONFIG_GUEST_AGENT' in config_host if 'CONFIG_GUEST_AGENT' in config_host
subdir('qga') subdir('qga')
endif endif
@ -315,6 +314,14 @@ if have_tools
subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-input')
subdir('contrib/vhost-user-scsi') subdir('contrib/vhost-user-scsi')
endif endif
if targetos == 'linux'
executable('qemu-bridge-helper', files('qemu-bridge-helper.c'),
dependencies: [qemuutil, libcap_ng],
install: true,
install_dir: get_option('libexecdir'))
endif
if 'CONFIG_IVSHMEM' in config_host if 'CONFIG_IVSHMEM' in config_host
subdir('contrib/ivshmem-client') subdir('contrib/ivshmem-client')
subdir('contrib/ivshmem-server') subdir('contrib/ivshmem-server')