diff options
author | Marc-André Lureau | 2022-02-02 10:19:04 +0100 |
---|---|---|
committer | Paolo Bonzini | 2022-02-21 10:35:54 +0100 |
commit | b7e4ab15c37424aac14a3492662fa26364269eb4 (patch) | |
tree | 270b6335cce1f899431b6e58457c706d70a393a4 /qga | |
parent | meson: require dynamic linking for VSS support (diff) | |
download | qemu-b7e4ab15c37424aac14a3492662fa26364269eb4.tar.gz qemu-b7e4ab15c37424aac14a3492662fa26364269eb4.tar.xz qemu-b7e4ab15c37424aac14a3492662fa26364269eb4.zip |
meson, configure: move ntddscsi API check to meson
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qga')
-rw-r--r-- | qga/commands-win32.c | 6 | ||||
-rw-r--r-- | qga/meson.build | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 484cb1c6bd..4fbbad793f 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -18,7 +18,7 @@ #include <ws2tcpip.h> #include <iptypes.h> #include <iphlpapi.h> -#ifdef CONFIG_QGA_NTDDSCSI +#ifdef HAVE_NTDDSCSI #include <winioctl.h> #include <ntddscsi.h> #endif @@ -474,7 +474,7 @@ void qmp_guest_file_flush(int64_t handle, Error **errp) } } -#ifdef CONFIG_QGA_NTDDSCSI +#ifdef HAVE_NTDDSCSI static GuestDiskBusType win2qemu[] = { [BusTypeUnknown] = GUEST_DISK_BUS_TYPE_UNKNOWN, @@ -1111,7 +1111,7 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp) return NULL; } -#endif /* CONFIG_QGA_NTDDSCSI */ +#endif /* HAVE_NTDDSCSI */ static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp) { diff --git a/qga/meson.build b/qga/meson.build index d22ecb4187..54f2da5b07 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -88,7 +88,7 @@ if targetos == 'windows' qga_libs += ['-lole32', '-loleaut32', '-lshlwapi', '-lstdc++', '-Wl,--enable-stdcall-fixup'] subdir('vss-win32') endif - if 'CONFIG_QGA_NTDDSCSI' in config_host + if have_ntddscsi qga_libs += ['-lsetupapi', '-lcfgmgr32'] endif endif |