endif
have_qga_vss = get_option('qga_vss') \
- .require(targetos == 'windows',
+ .require(host_os == 'windows',
error_message: 'VSS support requires Windows') \
- .require(link_language == 'cpp',
+ .require('cpp' in all_languages,
error_message: 'VSS support requires a C++ compiler') \
.require(have_vss, error_message: '''VSS support requires VSS headers.
If your Visual Studio installation doesn't have the VSS headers,
'guest-agent-command-state.c',
'main.c',
'cutils.c',
+ 'commands-common-ssh.c'
))
-qga_ss.add(when: 'CONFIG_POSIX', if_true: files(
- 'channel-posix.c',
- 'commands-posix.c',
- 'commands-posix-ssh.c',
-))
-qga_ss.add(when: 'CONFIG_LINUX', if_true: files(
- 'commands-linux.c',
-))
-qga_ss.add(when: 'CONFIG_BSD', if_true: files(
- 'commands-bsd.c',
-))
-qga_ss.add(when: 'CONFIG_WIN32', if_true: files(
- 'channel-win32.c',
- 'commands-win32.c',
- 'service-win32.c',
- 'vss-win32.c'
-))
+if host_os == 'windows'
+ qga_ss.add(files(
+ 'channel-win32.c',
+ 'commands-win32.c',
+ 'service-win32.c',
+ 'vss-win32.c',
+ 'commands-windows-ssh.c'
+ ))
+else
+ qga_ss.add(files(
+ 'channel-posix.c',
+ 'commands-posix.c',
+ 'commands-posix-ssh.c',
+ ))
+ if host_os == 'linux'
+ qga_ss.add(files('commands-linux.c'))
+ elif host_os in bsd_oses
+ qga_ss.add(files('commands-bsd.c'))
+ endif
+endif
-qga_ss = qga_ss.apply(config_host, strict: false)
+qga_ss = qga_ss.apply({})
gen_tlb = []
qga_libs = []
-if targetos == 'windows'
+if host_os == 'windows'
qga_libs += ['-lws2_32', '-lwinmm', '-lpowrprof', '-lwtsapi32', '-lwininet', '-liphlpapi', '-lnetapi32',
- '-lsetupapi', '-lcfgmgr32']
+ '-lsetupapi', '-lcfgmgr32', '-luserenv']
if have_qga_vss
qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++', '-Wl,--enable-stdcall-fixup']
subdir('vss-win32')
endif
qga_objs = []
-if targetos == 'windows'
+if host_os == 'windows'
windmc = find_program('windmc', required: true)
windres = find_program('windres', required: true)
install: true)
all_qga += qga
-if targetos == 'windows'
+if host_os == 'windows'
qemu_ga_msi_arch = {
'x86': ['-D', 'Arch=32'],
'x86_64': ['-a', 'x64', '-D', 'Arch=64']
qemu_ga_msi_vss = ['-D', 'InstallVss']
deps += qga_vss
endif
- if glib.version() < '2.73.2'
+ if glib.version().version_compare('<2.73.2')
libpcre = 'libpcre1'
else
libpcre = 'libpcre2'
endif
+ qga_msi_version = get_option('qemu_ga_version') == '' \
+ ? meson.project_version() \
+ : get_option('qemu_ga_version')
qga_msi = custom_target('QGA MSI',
input: files('installer/qemu-ga.wxs'),
output: 'qemu-ga-@0@.msi'.format(host_arch),
qemu_ga_msi_arch[cpu],
qemu_ga_msi_vss,
'-D', 'BUILD_DIR=' + meson.project_build_root(),
- '-D', 'BIN_DIR=' + glib.get_variable('bindir'),
- '-D', 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
- '-D', 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
- '-D', 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],
+ '-D', 'BIN_DIR=' + glib_pc.get_variable('bindir'),
+ '-D', 'QEMU_GA_VERSION=' + qga_msi_version,
+ '-D', 'QEMU_GA_MANUFACTURER=' + get_option('qemu_ga_manufacturer'),
+ '-D', 'QEMU_GA_DISTRO=' + get_option('qemu_ga_distro'),
'-D', 'LIBPCRE=' + libpcre,
])
all_qga += [qga_msi]
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-# disable qga-ssh-test for now. glib's G_TEST_OPTION_ISOLATE_DIRS triggers
+# disable qga-ssh-test with fuzzing: glib's G_TEST_OPTION_ISOLATE_DIRS triggers
# the leak detector in build-oss-fuzz Gitlab CI test. we should re-enable
# this when an alternative is implemented or when the underlying glib
# issue is identified/fix
-#if 'CONFIG_POSIX' in config_host
-if false
- srcs = [files('commands-posix-ssh.c')]
+if host_os != 'windows' and not get_option('fuzzing')
+ srcs = [files('commands-common-ssh.c', 'commands-posix-ssh.c')]
i = 0
foreach output: qga_qapi_outputs
if output.startswith('qga-qapi-types') or output.startswith('qga-qapi-visit')