| Message ID | 1437061085-9370-1-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 16 July 2015 at 16:38, Gerd Hoffmann <kraxel@redhat.com> wrote: > Hi, > > A few input fixes for 2.4. Also enable virtio-input builds on > non-linux hosts after fixing up the ioctl include. > > please pull, > Gerd > > The following changes since commit f3a1b5068cea303a55e2a21a97e66d057eaae638: > > Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-07-13 13:35:51 +0100) > > are available in the git repository at: > > > git://git.kraxel.org/qemu tags/pull-input-20150714-1 > > for you to fetch changes up to 8121c09e8a52fd47254479d8f5ccbbc20e7bb718: > > hid: clarify hid_keyboard_process_keycode (2015-07-14 13:48:45 +0200) > > ---------------------------------------------------------------- > input: fixes for 2.4 > > ---------------------------------------------------------------- I'm afraid this doesn't build for Windows: In file included from /home/petmay01/linaro/qemu-for-merges/hw/input/virtio-input.c:13: /home/petmay01/linaro/qemu-for-merges/include/standard-headers/linux/input.h:890:1: error: "SW_MAX" redefined In file included from /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/windows.h:55, from /home/petmay01/linaro/qemu-for-merges/include/sysemu/os-win32.h:29, from /home/petmay01/linaro/qemu-for-merges/include/qemu-common.h:48, from /home/petmay01/linaro/qemu-for-merges/include/qemu/iov.h:17, from /home/petmay01/linaro/qemu-for-merges/hw/input/virtio-input.c:7: /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/winuser.h:729:1: error: this is the location of the previous definition thanks -- PMM
Hi, > I'm afraid this doesn't build for Windows: > > In file included from > /home/petmay01/linaro/qemu-for-merges/hw/input/virtio-input.c:13: > /home/petmay01/linaro/qemu-for-merges/include/standard-headers/linux/input.h:890:1: > error: "SW_MAX" redefined > In file included from > /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/windows.h:55, > from > /home/petmay01/linaro/qemu-for-merges/include/sysemu/os-win32.h:29, > from > /home/petmay01/linaro/qemu-for-merges/include/qemu-common.h:48, > from > /home/petmay01/linaro/qemu-for-merges/include/qemu/iov.h:17, > from > /home/petmay01/linaro/qemu-for-merges/hw/input/virtio-input.c:7: > /usr/lib/gcc/i586-mingw32msvc/4.2.1-sjlj/../../../../i586-mingw32msvc/include/winuser.h:729:1: > error: this is the location of the previous definition Lovely. Looks like a bug in the mingw headers to me, especially as my machine cross-builds this just fine for both win32 and win64. We are in hard-freeze though, so no time to experiments here, I'll redo the pull with patch #3 dropped, lets sort this post-2.4. cheers, Gerd
Hi, A few input fixes for 2.4. Also enable virtio-input builds on non-linux hosts after fixing up the ioctl include. please pull, Gerd The following changes since commit f3a1b5068cea303a55e2a21a97e66d057eaae638: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-07-13 13:35:51 +0100) are available in the git repository at: git://git.kraxel.org/qemu tags/pull-input-20150714-1 for you to fetch changes up to 8121c09e8a52fd47254479d8f5ccbbc20e7bb718: hid: clarify hid_keyboard_process_keycode (2015-07-14 13:48:45 +0200) ---------------------------------------------------------------- input: fixes for 2.4 ---------------------------------------------------------------- Gerd Hoffmann (2): virtio-input: move sys/ioctl.h include virtio-input: enable on non-linux hosts Lin Ma (1): virtio-input: fix segfault in virtio_input_hid_properties Paolo Bonzini (1): hid: clarify hid_keyboard_process_keycode hw/input/Makefile.objs | 2 +- hw/input/hid.c | 32 ++++++++++++++++++++++++++++---- hw/input/virtio-input-hid.c | 1 + hw/input/virtio-input-host.c | 1 + include/standard-headers/linux/input.h | 1 - scripts/update-linux-headers.sh | 1 + 6 files changed, 32 insertions(+), 6 deletions(-)