[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 01/12] update-linux-headers: Rename SW_MAX to SW_M
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v3 01/12] update-linux-headers: Rename SW_MAX to SW_MAX_ |
Date: |
Fri, 9 Oct 2015 16:36:36 +0200 |
The next commit will compile hw/input/virtio-input.c and
hw/input/virtio-input-hid.c even when CONFIG_LINUX is off. These
files include both "include/standard-headers/linux/input.h" and
<windows.h> then. Doesn't work, because both define SW_MAX. We don't
actually use it. Patch input.h to define SW_MAX_ instead.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
---
include/standard-headers/linux/input.h | 4 ++--
scripts/update-linux-headers.sh | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/standard-headers/linux/input.h
b/include/standard-headers/linux/input.h
index b003c67..43f1850 100644
--- a/include/standard-headers/linux/input.h
+++ b/include/standard-headers/linux/input.h
@@ -887,8 +887,8 @@ struct input_keymap_entry {
#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */
#define SW_LINEIN_INSERT 0x0d /* set = inserted */
#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
-#define SW_MAX 0x0f
-#define SW_CNT (SW_MAX+1)
+#define SW_MAX_ 0x0f
+#define SW_CNT (SW_MAX_+1)
/*
* Misc events
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 11076191..457ef37 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -53,6 +53,7 @@ cp_portable() {
-e 's/__attribute__((packed))/QEMU_PACKED/' \
-e 's/__inline__/inline/' \
-e '/sys\/ioctl.h/d' \
+ -e 's/SW_MAX/SW_MAX_/' \
"$f" > "$to/$header";
}
--
2.4.3
- [Qemu-devel] [PULL v3 00/12] Fix device introspection regressions, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v3 08/12] libqtest: New hmp() & friends, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v3 07/12] libqtest: Clean up unused QTestState member sigact_old, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v3 01/12] update-linux-headers: Rename SW_MAX to SW_MAX_,
Markus Armbruster <=
- [Qemu-devel] [PULL v3 09/12] device-introspect-test: New, covering device introspection, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v3 03/12] memory: allow destroying a non-empty MemoryRegion, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v3 02/12] virtio-input: Fix device introspection on non-Linux hosts, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v3 12/12] Revert "qdev: Use qdev_get_device_class() for -device <type>, help", Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v3 04/12] hw: do not pass NULL to memory_region_init from instance_init, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v3 11/12] qdev: Protect device-list-properties against broken devices, Markus Armbruster, 2015/10/09
- [Qemu-devel] [PULL v3 06/12] tests: Fix how qom-test is run, Markus Armbruster, 2015/10/10
- [Qemu-devel] [PULL v3 10/12] qmp: Fix device-list-properties not to crash for abstract device, Markus Armbruster, 2015/10/10
- [Qemu-devel] [PULL v3 05/12] macio: move DBDMA_init from instance_init to realize, Markus Armbruster, 2015/10/10