[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 14/14] configure: improve usbfs check
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PULL 14/14] configure: improve usbfs check |
Date: |
Thu, 14 Feb 2019 11:47:17 +0100 |
From: Thomas Petazzoni <address@hidden>
The current check to test if usbfs support should be compiled or not
solely relies on the presence of <linux/usbdevice_fs.h>, without
actually checking that all definition used by Qemu are provided by
this header file.
With sufficiently old kernel headers, <linux/usbdevice_fs.h> may be
present, but some of the definitions needed by Qemu may not be
available.
This commit improves the check by building a small program that
actually tests whether the necessary definitions are available.
In addition, it fixes a bug where have_usbfs was set to "yes"
regardless of the result of the test.
Signed-off-by: Thomas Petazzoni <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
configure | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index c0f278141823..90b9e2fa3c05 100755
--- a/configure
+++ b/configure
@@ -4262,10 +4262,25 @@ fi
# check for usbfs
have_usbfs=no
if test "$linux_user" = "yes"; then
- if check_include linux/usbdevice_fs.h; then
+ cat > $TMPC << EOF
+#include <linux/usbdevice_fs.h>
+
+#ifndef USBDEVFS_GET_CAPABILITIES
+#error "USBDEVFS_GET_CAPABILITIES undefined"
+#endif
+
+#ifndef USBDEVFS_DISCONNECT_CLAIM
+#error "USBDEVFS_DISCONNECT_CLAIM undefined"
+#endif
+
+int main(void)
+{
+ return 0;
+}
+EOF
+ if compile_prog "" ""; then
have_usbfs=yes
fi
- have_usbfs=yes
fi
# check for fallocate
--
2.20.1
- [Qemu-trivial] [PULL 13/14] hw/sparc64: Explicitly set default_display = "std", (continued)
- [Qemu-trivial] [PULL 13/14] hw/sparc64: Explicitly set default_display = "std", Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 03/14] qemu-options: Remove deprecated option -clock, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 05/14] configure: fix qemu-img name, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 07/14] configure: Make -Waddress-of-packed-member warnings be errors, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 11/14] wavcapture: Convert to error_report, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 08/14] pckbd: Convert DPRINTF->trace, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 12/14] hw/dma/i8257: Use qemu_log_mask(UNIMP) instead of fprintf, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 09/14] HMP: Prepend errors with 'Error:', Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 02/14] qemu-deprecated: Remove -virtioconsole and -no-frame for good, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 01/14] qapi: Fix qcow2 encryption doc typo, Laurent Vivier, 2019/02/14
- [Qemu-trivial] [PULL 14/14] configure: improve usbfs check,
Laurent Vivier <=
- [Qemu-trivial] [PULL 10/14] kvm: Add kvm_set_ioeventfd* traces, Laurent Vivier, 2019/02/14
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/14] Trivial branch patches, Peter Maydell, 2019/02/14