* [PATCH] Fix build with 64 bits time_t
@ 2020-11-17 20:28 Fabrice Fontaine
2020-11-18 7:53 ` Michael S. Tsirkin
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2020-11-17 20:28 UTC (permalink / raw)
To: qemu-devel; +Cc: Fabrice Fontaine, Gerd Hoffmann, Michael S . Tsirkin
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>
---
contrib/vhost-user-input/main.c | 10 +++++++++-
hw/input/virtio-input-host.c | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
index 6020c6f33a..e688c3e0a9 100644
--- a/contrib/vhost-user-input/main.c
+++ b/contrib/vhost-user-input/main.c
@@ -17,6 +17,11 @@
#include "standard-headers/linux/virtio_input.h"
#include "qapi/error.h"
+#ifndef input_event_sec
+#define input_event_sec time.tv_sec
+#define input_event_usec time.tv_usec
+#endif
+
enum {
VHOST_USER_INPUT_MAX_QUEUES = 2,
};
@@ -115,13 +120,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..2e261737e1 100644
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -16,6 +16,11 @@
#include <sys/ioctl.h>
#include "standard-headers/linux/input.h"
+#ifndef input_event_sec
+#define input_event_sec time.tv_sec
+#define input_event_usec time.tv_usec
+#endif
+
/* ----------------------------------------------------------------- */
static struct virtio_input_config virtio_input_host_config[] = {
@@ -193,13 +198,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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix build with 64 bits time_t
2020-11-17 20:28 [PATCH] Fix build with 64 bits time_t Fabrice Fontaine
@ 2020-11-18 7:53 ` Michael S. Tsirkin
0 siblings, 0 replies; 2+ messages in thread
From: Michael S. Tsirkin @ 2020-11-18 7:53 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: qemu-devel, Gerd Hoffmann
On Tue, Nov 17, 2020 at 09:28:46PM +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)) {
> | ^
>
> 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>
> ---
> contrib/vhost-user-input/main.c | 10 +++++++++-
> hw/input/virtio-input-host.c | 10 +++++++++-
> 2 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
> index 6020c6f33a..e688c3e0a9 100644
> --- a/contrib/vhost-user-input/main.c
> +++ b/contrib/vhost-user-input/main.c
> @@ -17,6 +17,11 @@
> #include "standard-headers/linux/virtio_input.h"
> #include "qapi/error.h"
>
> +#ifndef input_event_sec
> +#define input_event_sec time.tv_sec
> +#define input_event_usec time.tv_usec
> +#endif
> +
> enum {
> VHOST_USER_INPUT_MAX_QUEUES = 2,
> };
Just update ./include/standard-headers/linux/input.h, we'll get these
defines for free.
> @@ -115,13 +120,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..2e261737e1 100644
> --- a/hw/input/virtio-input-host.c
> +++ b/hw/input/virtio-input-host.c
> @@ -16,6 +16,11 @@
> #include <sys/ioctl.h>
> #include "standard-headers/linux/input.h"
>
> +#ifndef input_event_sec
> +#define input_event_sec time.tv_sec
> +#define input_event_usec time.tv_usec
> +#endif
> +
> /* ----------------------------------------------------------------- */
>
> static struct virtio_input_config virtio_input_host_config[] = {
> @@ -193,13 +198,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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-18 7:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-17 20:28 [PATCH] Fix build with 64 bits time_t Fabrice Fontaine
2020-11-18 7:53 ` Michael S. Tsirkin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.