[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] linux-user: fix build with 5.2-rc2 kernel headers
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PATCH] linux-user: fix build with 5.2-rc2 kernel headers |
Date: |
Tue, 4 Jun 2019 09:19:15 +0200 |
Since kernel commit 0768e17073dc527ccd ("net: socket: implement 64-bit
timestamps") the linux kernel headers (those installed on the build
system, not those that are synced to QEMU) will make qemu-user fail to
build:
/root/rpmbuild/BUILD/qemu-4.0.50/linux-user/ioctls.h:222:9: error: 'SIOCGSTAMP'
undeclared here (not in a function); did you mean 'SIOCSRARP'?
222 | IOCTL(SIOCGSTAMP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timeval)))
| ^~~~~~~~~~
Let us fix this by including "linux/sockios.h" instead of relying on
"sys/socket.h" providing those defines via an include chain.
Cc: Riku Voipio <address@hidden>
Cc: Laurent Vivier <address@hidden>
Cc: Arnd Bergmann <address@hidden>
Reported-by: Gerhard Stenzel <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
linux-user/syscall.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index efa3ec2837..7332be9b06 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -34,6 +34,7 @@
#include <sys/resource.h>
#include <sys/swap.h>
#include <linux/capability.h>
+#include <linux/sockios.h>
#include <sched.h>
#include <sys/timex.h>
#include <sys/socket.h>
--
2.21.0
- [Qemu-devel] [PATCH] linux-user: fix build with 5.2-rc2 kernel headers,
Christian Borntraeger <=