motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 17:23:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure, meson: cleanup qemu-ga libraries

Browse source 
Move LIBS_QGA to meson.build, remove dead QGA_VSS_PROVIDER variable.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-10-15 16:28:29 +02:00
parent 0d04c4c9de
commit 8726368593
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configure vendored
View file

@ -240,7 +240,6 @@ block_drv_rw_whitelist=""
block_drv_ro_whitelist="" block_drv_ro_whitelist=""
block_drv_whitelist_tools="no" block_drv_whitelist_tools="no"
host_cc="cc" host_cc="cc"
libs_qga=""
debug_info="yes" debug_info="yes"
lto="false" lto="false"
stack_protector="" stack_protector=""
@ -708,7 +707,6 @@ if test "$mingw32" = "yes" ; then
write_c_skeleton; write_c_skeleton;
prefix="/qemu" prefix="/qemu"
qemu_suffix="" qemu_suffix=""
libs_qga="-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi -lnetapi32 $libs_qga"
fi fi
werror="" werror=""
@ -2475,8 +2473,6 @@ EOF
if compile_prog "$vss_win32_include" "" ; then if compile_prog "$vss_win32_include" "" ; then
guest_agent_with_vss="yes" guest_agent_with_vss="yes"
QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include" QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"
libs_qga="-lole32 -loleaut32 -lshlwapi -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"
qga_vss_provider="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb"
else else
if test "$vss_win32_sdk" != "" ; then if test "$vss_win32_sdk" != "" ; then
echo "ERROR: Please download and install Microsoft VSS SDK:" echo "ERROR: Please download and install Microsoft VSS SDK:"
@ -2527,7 +2523,6 @@ int main(void) {
EOF EOF
if compile_prog "" "" ; then if compile_prog "" "" ; then
guest_agent_ntddscsi=yes guest_agent_ntddscsi=yes
libs_qga="-lsetupapi -lcfgmgr32 $libs_qga"
fi fi
fi fi
@ -3085,7 +3080,6 @@ if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=y" >> $config_host_mak echo "CONFIG_WIN32=y" >> $config_host_mak
if test "$guest_agent_with_vss" = "yes" ; then if test "$guest_agent_with_vss" = "yes" ; then
echo "CONFIG_QGA_VSS=y" >> $config_host_mak echo "CONFIG_QGA_VSS=y" >> $config_host_mak
echo "QGA_VSS_PROVIDER=$qga_vss_provider" >> $config_host_mak
echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
fi fi
if test "$guest_agent_ntddscsi" = "yes" ; then if test "$guest_agent_ntddscsi" = "yes" ; then
@ -3337,7 +3331,6 @@ echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
echo "STRIP=$strip" >> $config_host_mak echo "STRIP=$strip" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak
echo "LIBS_QGA=$libs_qga" >> $config_host_mak
if test "$rng_none" = "yes"; then if test "$rng_none" = "yes"; then
echo "CONFIG_RNG_NONE=y" >> $config_host_mak echo "CONFIG_RNG_NONE=y" >> $config_host_mak

25
qga/meson.build
View file

@ -1,3 +1,5 @@
all_qga = []
qga_qapi_outputs = [ qga_qapi_outputs = [
'qga-qapi-commands.c', 'qga-qapi-commands.c',
'qga-qapi-commands.h', 'qga-qapi-commands.h',
@ -50,19 +52,26 @@ qga_ss.add(when: 'CONFIG_WIN32', if_true: files(
qga_ss = qga_ss.apply(config_host, strict: false) qga_ss = qga_ss.apply(config_host, strict: false)
gen_tlb = []
qga_libs = []
if targetos == 'windows'
qga_libs += ['-lws2_32', '-lwinmm', '-lpowrprof', '-lwtsapi32', '-lwininet', '-liphlpapi', '-lnetapi32']
if 'CONFIG_QGA_VSS' in config_host
qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++', '-Wl,--enable-stdcall-fixup']
subdir('vss-win32')
endif
if 'CONFIG_QGA_NTDDSCSI' in config_host
qga_libs += ['-lsetupapi', '-lcfgmgr32']
endif
endif
qga = executable('qemu-ga', qga_ss.sources(), qga = executable('qemu-ga', qga_ss.sources(),
link_args: config_host['LIBS_QGA'].split(), link_args: qga_libs,
dependencies: [qemuutil, libudev], dependencies: [qemuutil, libudev],
install: true) install: true)
all_qga = [qga] all_qga += qga
if targetos == 'windows' if targetos == 'windows'
if 'CONFIG_QGA_VSS' in config_host
subdir('vss-win32')
else
gen_tlb = []
endif
qemu_ga_msi_arch = { qemu_ga_msi_arch = {
'x86': ['-D', 'Arch=32'], 'x86': ['-D', 'Arch=32'],
'x86_64': ['-a', 'x64', '-D', 'Arch=64'] 'x86_64': ['-a', 'x64', '-D', 'Arch=64']