summaryrefslogtreecommitdiffstats
path: root/qemu/linux-user/x86_64
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:18:31 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-05-18 13:42:15 +0300
commit437fd90c0250dee670290f9b714253671a990160 (patch)
treeb871786c360704244a07411c69fb58da9ead4a06 /qemu/linux-user/x86_64
parent5bbd6fe9b8bab2a93e548c5a53b032d1939eec05 (diff)
These changes are the raw update to qemu-2.6.
Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'qemu/linux-user/x86_64')
-rw-r--r--qemu/linux-user/x86_64/syscall_nr.h15
-rw-r--r--qemu/linux-user/x86_64/target_syscall.h (renamed from qemu/linux-user/x86_64/syscall.h)5
2 files changed, 19 insertions, 1 deletions
diff --git a/qemu/linux-user/x86_64/syscall_nr.h b/qemu/linux-user/x86_64/syscall_nr.h
index 7c59e3a09..16397b3e8 100644
--- a/qemu/linux-user/x86_64/syscall_nr.h
+++ b/qemu/linux-user/x86_64/syscall_nr.h
@@ -281,7 +281,7 @@
#define TARGET_NR_utimensat 280
#define TARGET_NR_epoll_pwait 281
#define TARGET_NR_signalfd 282
-#define TARGET_NR_timerfd 283
+#define TARGET_NR_timerfd_create 283
#define TARGET_NR_eventfd 284
#define TARGET_NR_fallocate 285
#define TARGET_NR_timerfd_settime 286
@@ -312,3 +312,16 @@
#define TARGET_NR_process_vm_writev 311
#define TARGET_NR_kcmp 312
#define TARGET_NR_finit_module 313
+#define TARGET_NR_sched_setattr 314
+#define TARGET_NR_sched_getattr 315
+#define TARGET_NR_renameat2 316
+#define TARGET_NR_seccomp 317
+#define TARGET_NR_getrandom 318
+#define TARGET_NR_memfd_create 319
+#define TARGET_NR_kexec_file_load 320
+#define TARGET_NR_bpf 321
+#define TARGET_NR_execveat 322
+#define TARGET_NR_userfaultfd 323
+#define TARGET_NR_membarrier 324
+#define TARGET_NR_mlock2 325
+#define TARGET_NR_copy_file_range 326
diff --git a/qemu/linux-user/x86_64/syscall.h b/qemu/linux-user/x86_64/target_syscall.h
index 88b3c3fe3..feecd32d5 100644
--- a/qemu/linux-user/x86_64/syscall.h
+++ b/qemu/linux-user/x86_64/target_syscall.h
@@ -1,3 +1,6 @@
+#ifndef TARGET_SYSCALL_H
+#define TARGET_SYSCALL_H
+
#define __USER_CS (0x33)
#define __USER_DS (0x2B)
@@ -100,3 +103,5 @@ struct target_msqid64_ds {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
+
+#endif /* TARGET_SYSCALL_H */