[Qemu-devel] [PATCH] virtio-input: enable on non-linux hosts

[Qemu-devel] [PATCH] virtio-input: enable on non-linux hosts

[Gerd Hoffmann]

As we include a copy of the linux input layer header file in the qemu
source tree (include/standard-headers/linux/input.h) the virtio-input
bits (except pass-through) should build and work just fine on non-linux
hosts too.  Tweak Makefile accordingly.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/input/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs
index 624ba7e..7715d72 100644
--- a/hw/input/Makefile.objs
+++ b/hw/input/Makefile.objs
@@ -8,9 +8,9 @@ common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
 common-obj-$(CONFIG_TSC2005) += tsc2005.o
 common-obj-$(CONFIG_VMMOUSE) += vmmouse.o
 
-ifeq ($(CONFIG_LINUX),y)
 common-obj-$(CONFIG_VIRTIO) += virtio-input.o
 common-obj-$(CONFIG_VIRTIO) += virtio-input-hid.o
+ifeq ($(CONFIG_LINUX),y)
 common-obj-$(CONFIG_VIRTIO) += virtio-input-host.o
 endif
 
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] virtio-input: enable on non-linux hosts

[Peter Maydell]

On 13 July 2015 at 08:30, Gerd Hoffmann <kraxel@redhat.com> wrote:
> As we include a copy of the linux input layer header file in the qemu
> source tree (include/standard-headers/linux/input.h) the virtio-input
> bits (except pass-through) should build and work just fine on non-linux
> hosts too.  Tweak Makefile accordingly.

Does "should" here mean "I haven't actually tested it" ? :-)

thanks
-- PMM

Re: [Qemu-devel] [PATCH] virtio-input: enable on non-linux hosts

[Gerd Hoffmann]

On Mo, 2015-07-13 at 09:56 +0100, Peter Maydell wrote:
> On 13 July 2015 at 08:30, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > As we include a copy of the linux input layer header file in the qemu
> > source tree (include/standard-headers/linux/input.h) the virtio-input
> > bits (except pass-through) should build and work just fine on non-linux
> > hosts too.  Tweak Makefile accordingly.
> 
> Does "should" here mean "I haven't actually tested it" ? :-)

Did a build test on freebsd -- passed.

cheers,
  Gerd

Re: [Qemu-devel] [PATCH] virtio-input: enable on non-linux hosts

[Gerd Hoffmann]

On Mo, 2015-07-13 at 13:48 +0200, Gerd Hoffmann wrote:
> On Mo, 2015-07-13 at 09:56 +0100, Peter Maydell wrote:
> > On 13 July 2015 at 08:30, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > > As we include a copy of the linux input layer header file in the qemu
> > > source tree (include/standard-headers/linux/input.h) the virtio-input
> > > bits (except pass-through) should build and work just fine on non-linux
> > > hosts too.  Tweak Makefile accordingly.
> > 
> > Does "should" here mean "I haven't actually tested it" ? :-)
> 
> Did a build test on freebsd -- passed.

Oops, the windows cross builds fails though (due to
include/standard-headers/linux/input.h including sys/ioctl.h).

Ok, scratch that one, back to the drawing board ...

sorry,
  Gerd

Re: [Qemu-devel] [PATCH] virtio-input: enable on non-linux hosts

[Paolo Bonzini]

On 13/07/2015 14:01, Gerd Hoffmann wrote:
>> > 
>> > Did a build test on freebsd -- passed.
> Oops, the windows cross builds fails though (due to
> include/standard-headers/linux/input.h including sys/ioctl.h).
> 
> Ok, scratch that one, back to the drawing board ...

The sys/ioctl.h include doesn't seem too useful.  This patch compiles:

diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index f7e3d84..3feecfd 100644
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -12,6 +12,7 @@
 #include "hw/virtio/virtio-input.h"

 #include "standard-headers/linux/input.h"
+#include <sys/ioctl.h>

 /* ----------------------------------------------------------------- */

diff --git a/include/standard-headers/linux/input.h
b/include/standard-headers/linux/input.h
index a459dd2..b003c67 100644
--- 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"


Perhaps we can drop the include in scripts/update-linux-headers.sh?

Paolo