[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/11] configure: add configure check for ntdddisk.h
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 09/11] configure: add configure check for ntdddisk.h |
Date: |
Tue, 7 Jul 2015 21:11:34 -0500 |
This header file provides w32 ioctl definitions for working with disk
devices. Older versions of mingw do not expose this in a useable way,
so add a configure check and report it via CONFIG_QGA_NTDDSCSI.
Subsequent patches will use this macro to stub out functionality that
relies on this in cases where it's not available.
Signed-off-by: Michael Roth <address@hidden>
---
configure | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/configure b/configure
index 3bb5e55..62fa05d 100755
--- a/configure
+++ b/configure
@@ -315,6 +315,7 @@ snappy=""
bzip2=""
guest_agent=""
guest_agent_with_vss="no"
+guest_agent_ntddscsi="no"
guest_agent_msi=""
vss_win32_sdk=""
win_sdk="no"
@@ -3820,6 +3821,25 @@ if test "$mingw32" = "yes" -a "$guest_agent" != "no" -a
"$guest_agent_with_vss"
fi
##########################################
+# check if mingw environment provides a recent ntddscsi.h
+if test "$mingw32" = "yes" -a "$guest_agent" != "no"; 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
+
+##########################################
# Guest agent Window MSI package
if test "$guest_agent" != yes; then
@@ -4489,6 +4509,7 @@ echo "libiscsi support $libiscsi"
echo "libnfs support $libnfs"
echo "build guest agent $guest_agent"
echo "QGA VSS support $guest_agent_with_vss"
+echo "QGA w32 disk info $guest_agent_ntddscsi"
echo "seccomp support $seccomp"
echo "coroutine backend $coroutine"
echo "coroutine pool $coroutine_pool"
@@ -4566,6 +4587,9 @@ if test "$mingw32" = "yes" ; then
echo "CONFIG_QGA_VSS=y" >> $config_host_mak
echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak
fi
+ if test "$guest_agent_ntddscsi" = "yes" ; then
+ echo "CONFIG_QGA_NTDDDISK=y" >> $config_host_mak
+ fi
if test "$guest_agent_msi" != "no"; then
echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak
echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >>
$config_host_mak
--
1.9.1
- [Qemu-devel] [PULL v3 00/11] qemu-ga patches for 2.4.0, Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 09/11] configure: add configure check for ntdddisk.h,
Michael Roth <=
- [Qemu-devel] [PATCH 04/11] qga: add win32 library iphlpapi, Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 03/11] Revert "guest agent: remove g_strcmp0 usage", Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 07/11] qga: added empty qmp_quest_get_fsinfo functionality., Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 01/11] qga/commands-posix: Fix bug in guest-fstrim, Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 02/11] qga/qmp_guest_fstrim: Return per path fstrim result, Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 10/11] qga: added bus type and disk location path, Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 11/11] qga: added GuestPCIAddress information, Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 05/11] qga: win32 qmp_guest_network_get_interfaces implementation, Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 06/11] qga: fail early for invalid time, Michael Roth, 2015/07/07
- [Qemu-devel] [PATCH 08/11] qga: added mountpoint and filesystem type for single volume, Michael Roth, 2015/07/07