[PATCH v2] Fix build with 64 bits time_t

[PATCH v2] Fix build with 64 bits time_t

[Fabrice Fontaine]

time element is deprecated on new input_event structure in kernel's
input.h [1]

This will avoid the following build failure:

hw/input/virtio-input-host.c: In function 'virtio_input_host_handle_status':
hw/input/virtio-input-host.c:198:28: error: 'struct input_event' has no member named 'time'
  198 |     if (gettimeofday(&evdev.time, NULL)) {
      |                            ^

Fixes:
 - http://autobuild.buildroot.org/results/a538167e288c14208d557cd45446df86d3d599d5
 - http://autobuild.buildroot.org/results/efd4474fb4b6c0ce0ab3838ce130429c51e43bbb

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Michael S. Tsirkin):
 - Drop define of input_event_{sec,usec} as it is already done in 
   include/standard-headers/linux/input.h

 contrib/vhost-user-input/main.c | 5 ++++-
 hw/input/virtio-input-host.c    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
index 6020c6f33a..84de1f0b87 100644
--- a/contrib/vhost-user-input/main.c
+++ b/contrib/vhost-user-input/main.c
@@ -115,13 +115,16 @@ vi_evdev_watch(VuDev *dev, int condition, void *data)
 static void vi_handle_status(VuInput *vi, virtio_input_event *event)
 {
     struct input_event evdev;
+    struct timeval tval;
     int rc;
 
-    if (gettimeofday(&evdev.time, NULL)) {
+    if (gettimeofday(&tval, NULL)) {
         perror("vi_handle_status: gettimeofday");
         return;
     }
 
+    evdev.input_event_sec = tval.tv_sec;
+    evdev.input_event_usec = tval.tv_usec;
     evdev.type = le16toh(event->type);
     evdev.code = le16toh(event->code);
     evdev.value = le32toh(event->value);
diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index 85daf73f1a..137efba57b 100644
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -193,13 +193,16 @@ static void virtio_input_host_handle_status(VirtIOInput *vinput,
 {
     VirtIOInputHost *vih = VIRTIO_INPUT_HOST(vinput);
     struct input_event evdev;
+    struct timeval tval;
     int rc;
 
-    if (gettimeofday(&evdev.time, NULL)) {
+    if (gettimeofday(&tval, NULL)) {
         perror("virtio_input_host_handle_status: gettimeofday");
         return;
     }
 
+    evdev.input_event_sec = tval.tv_sec;
+    evdev.input_event_usec = tval.tv_usec;
     evdev.type = le16_to_cpu(event->type);
     evdev.code = le16_to_cpu(event->code);
     evdev.value = le32_to_cpu(event->value);
-- 
2.29.2

Re: [PATCH v2] Fix build with 64 bits time_t

[Gerd Hoffmann]

On Wed, Nov 18, 2020 at 09:38:24PM +0100, Fabrice Fontaine wrote:
> time element is deprecated on new input_event structure in kernel's
> input.h [1]
> 
> This will avoid the following build failure:
> 
> hw/input/virtio-input-host.c: In function 'virtio_input_host_handle_status':
> hw/input/virtio-input-host.c:198:28: error: 'struct input_event' has no member named 'time'
>   198 |     if (gettimeofday(&evdev.time, NULL)) {
>       |                            ^

Fails to build (rhel-7).

>  - Drop define of input_event_{sec,usec} as it is already done in 
>    include/standard-headers/linux/input.h

Maybe these are not used?  So it breaks with old system headers?

take care,
  Gerd

Re: [PATCH v2] Fix build with 64 bits time_t

[Fabrice Fontaine]

Le mer. 25 nov. 2020 à 13:06, Gerd Hoffmann <kraxel@redhat.com> a écrit :
>
> On Wed, Nov 18, 2020 at 09:38:24PM +0100, Fabrice Fontaine wrote:
> > time element is deprecated on new input_event structure in kernel's
> > input.h [1]
> >
> > This will avoid the following build failure:
> >
> > hw/input/virtio-input-host.c: In function 'virtio_input_host_handle_status':
> > hw/input/virtio-input-host.c:198:28: error: 'struct input_event' has no member named 'time'
> >   198 |     if (gettimeofday(&evdev.time, NULL)) {
> >       |                            ^
>
> Fails to build (rhel-7).
>
> >  - Drop define of input_event_{sec,usec} as it is already done in
> >    include/standard-headers/linux/input.h
>
> Maybe these are not used?  So it breaks with old system headers?
contrib/vhost-user-input/main.c is including <linux/input.h> instead
of ./include/standard-headers/linux/input.h, this could be the root
cause. I'll send a v3.
>
> take care,
>   Gerd
>
Best Regards,

Fabrice