summaryrefslogtreecommitdiffstats
path: root/qemu/linux-user/i386
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/i386
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/i386')
-rw-r--r--qemu/linux-user/i386/syscall_nr.h29
-rw-r--r--qemu/linux-user/i386/target_syscall.h (renamed from qemu/linux-user/i386/syscall.h)5
2 files changed, 33 insertions, 1 deletions
diff --git a/qemu/linux-user/i386/syscall_nr.h b/qemu/linux-user/i386/syscall_nr.h
index c8f730219..bc1bc233e 100644
--- a/qemu/linux-user/i386/syscall_nr.h
+++ b/qemu/linux-user/i386/syscall_nr.h
@@ -324,7 +324,7 @@
#define TARGET_NR_epoll_pwait 319
#define TARGET_NR_utimensat 320
#define TARGET_NR_signalfd 321
-#define TARGET_NR_timerfd 322
+#define TARGET_NR_timerfd_create 322
#define TARGET_NR_eventfd 323
#define TARGET_NR_fallocate 324
#define TARGET_NR_timerfd_settime 325
@@ -353,3 +353,30 @@
#define TARGET_NR_process_vm_writev 348
#define TARGET_NR_kcmp 349
#define TARGET_NR_finit_module 350
+#define TARGET_NR_sched_setattr 351
+#define TARGET_NR_sched_getattr 352
+#define TARGET_NR_renameat2 353
+#define TARGET_NR_seccomp 354
+#define TARGET_NR_getrandom 355
+#define TARGET_NR_memfd_create 356
+#define TARGET_NR_bpf 357
+#define TARGET_NR_execveat 358
+#define TARGET_NR_socket 359
+#define TARGET_NR_socketpair 360
+#define TARGET_NR_bind 361
+#define TARGET_NR_connect 362
+#define TARGET_NR_listen 363
+#define TARGET_NR_accept4 364
+#define TARGET_NR_getsockopt 365
+#define TARGET_NR_setsockopt 366
+#define TARGET_NR_getsockname 367
+#define TARGET_NR_getpeername 368
+#define TARGET_NR_sendto 369
+#define TARGET_NR_sendmsg 370
+#define TARGET_NR_recvfrom 371
+#define TARGET_NR_recvmsg 372
+#define TARGET_NR_shutdown 373
+#define TARGET_NR_userfaultfd 374
+#define TARGET_NR_membarrier 375
+#define TARGET_NR_mlock2 376
+#define TARGET_NR_copy_file_range 377
diff --git a/qemu/linux-user/i386/syscall.h b/qemu/linux-user/i386/target_syscall.h
index 906aaac0b..0ac84dc02 100644
--- a/qemu/linux-user/i386/syscall.h
+++ b/qemu/linux-user/i386/target_syscall.h
@@ -1,3 +1,6 @@
+#ifndef TARGET_SYSCALL_H
+#define TARGET_SYSCALL_H
+
/* default linux values for the selectors */
#define __USER_CS (0x23)
#define __USER_DS (0x2B)
@@ -150,3 +153,5 @@ struct target_vm86plus_struct {
#define TARGET_MINSIGSTKSZ 2048
#define TARGET_MLOCKALL_MCL_CURRENT 1
#define TARGET_MLOCKALL_MCL_FUTURE 2
+
+#endif /* TARGET_SYSCALL_H */