virtio-input: move sys/ioctl.h include

Drop from include/standard-headers/linux/input.h
Add to hw/input/virtio-input-host.c instead.

That allows to build virtio-input (except pass-through) on windows.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index f7e3d844e6bcfd78c69f37a508749e30eea3e55b..8978f16bae96a27126ad759459f3db01213fc012 100644 (file)
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -11,6 +11,7 @@
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-input.h"
 
+#include <sys/ioctl.h>
 #include "standard-headers/linux/input.h"
 
 /* ----------------------------------------------------------------- */

diff --git a/include/standard-headers/linux/input.h b/include/standard-headers/linux/input.h
index a459dd25da8ee1cfc9f46b4205af10a54851af84..b003c670590f78a68a9377a4b84bff2231275bf8 100644 (file)
--- a/include/standard-headers/linux/input.h
+++ b/include/standard-headers/linux/input.h
@@ -10,7 +10,6 @@
 
 
 #include <sys/time.h>
-#include <sys/ioctl.h>
 #include <sys/types.h>
 #include "standard-headers/linux/types.h"
 

diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 47378d93d4d30d83fd71145d271fca9779741306..f0e830c2d6b082130c070d1996f3ebcf16842bdc 100755 (executable)
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -56,6 +56,7 @@ cp_virtio() {
                 -e 's/__bitwise__//' \
                 -e 's/__attribute__((packed))/QEMU_PACKED/' \
                 -e 's/__inline__/inline/' \
+                -e '/sys\/ioctl.h/d' \
                 "$f" > "$to/$header";
         done
     fi