mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 09:55:55 +00:00
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>
This commit is contained in:
parent
e23460ce92
commit
b7e4ab15c3
23
configure
vendored
23
configure
vendored
|
@ -2302,26 +2302,6 @@ EOF
|
|||
fi
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# check if mingw environment provides a recent ntddscsi.h
|
||||
guest_agent_ntddscsi="no"
|
||||
if test "$mingw32" = "yes"; then
|
||||
cat > $TMPC << EOF
|
||||
#include <windows.h>
|
||||
#include <ntddscsi.h>
|
||||
int main(void) {
|
||||
#if !defined(IOCTL_SCSI_GET_ADDRESS)
|
||||
#error Missing required ioctl definitions
|
||||
#endif
|
||||
SCSI_ADDRESS addr = { .Lun = 0, .TargetId = 0, .PathId = 0 };
|
||||
return addr.Lun;
|
||||
}
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
guest_agent_ntddscsi=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# capstone
|
||||
|
||||
|
@ -2831,9 +2811,6 @@ if test "$debug_tcg" = "yes" ; then
|
|||
fi
|
||||
if test "$mingw32" = "yes" ; then
|
||||
echo "CONFIG_WIN32=y" >> $config_host_mak
|
||||
if test "$guest_agent_ntddscsi" = "yes" ; then
|
||||
echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
|
||||
fi
|
||||
echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >> $config_host_mak
|
||||
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
|
||||
echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
|
||||
|
|
18
meson.build
18
meson.build
|
@ -1938,6 +1938,22 @@ if targetos == 'windows' and link_language == 'cpp'
|
|||
int main(void) { return VSS_CTX_BACKUP; }''')
|
||||
endif
|
||||
|
||||
have_ntddscsi = false
|
||||
if targetos == 'windows'
|
||||
have_ntddscsi = cc.compiles('''
|
||||
#include <windows.h>
|
||||
#include <ntddscsi.h>
|
||||
int main(void) {
|
||||
#if !defined(IOCTL_SCSI_GET_ADDRESS)
|
||||
#error Missing required ioctl definitions
|
||||
#endif
|
||||
SCSI_ADDRESS addr = { .Lun = 0, .TargetId = 0, .PathId = 0 };
|
||||
return addr.Lun;
|
||||
}
|
||||
''')
|
||||
endif
|
||||
config_host_data.set('HAVE_NTDDSCSI', have_ntddscsi)
|
||||
|
||||
ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
|
||||
'HAVE_GDB_BIN']
|
||||
arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
|
||||
|
@ -3605,7 +3621,7 @@ summary_info += {'libnfs support': libnfs}
|
|||
if targetos == 'windows'
|
||||
if have_ga
|
||||
summary_info += {'QGA VSS support': have_qga_vss}
|
||||
summary_info += {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_NTDDSCSI')}
|
||||
summary_info += {'QGA w32 disk info': have_ntddscsi}
|
||||
endif
|
||||
endif
|
||||
summary_info += {'seccomp support': seccomp}
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue