All of lore.kernel.org
 help / color / mirror / Atom feed
From: riku.voipio@linaro.org
To: qemu-devel@nongnu.org
Cc: Riku Voipio <riku.voipio@linaro.org>
Subject: [Qemu-devel] [PULL 8/8] linux-user: correct timerfd_create syscall numbers
Date: Fri, 19 Feb 2016 15:42:30 +0200	[thread overview]
Message-ID: <eaba57cb8145afd3e93bc7cc556a3ba7daad6c40.1455888929.git.riku.voipio@linaro.org> (raw)
In-Reply-To: <cover.1455888927.git.riku.voipio@linaro.org>

From: Riku Voipio <riku.voipio@linaro.org>

x86, m68k, ppc, sh4 and sparc failed to enable timerfd, because they
didn't have timerfd_create system call defined. Instead QEMU
defined timerfd syscall. Checking with kernel sources, it appears
kernel developers reused timerfd syscall number with timerfd_create,
presumably since no userspace called the old syscall number.

Reported-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/i386/syscall_nr.h   | 2 +-
 linux-user/m68k/syscall_nr.h   | 2 +-
 linux-user/ppc/syscall_nr.h    | 2 +-
 linux-user/sh4/syscall_nr.h    | 2 +-
 linux-user/sparc/syscall_nr.h  | 2 +-
 linux-user/x86_64/syscall_nr.h | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/linux-user/i386/syscall_nr.h b/linux-user/i386/syscall_nr.h
index fa3f0b4..bc1bc23 100644
--- a/linux-user/i386/syscall_nr.h
+++ b/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
diff --git a/linux-user/m68k/syscall_nr.h b/linux-user/m68k/syscall_nr.h
index a2daba0..4b50fb2 100644
--- a/linux-user/m68k/syscall_nr.h
+++ b/linux-user/m68k/syscall_nr.h
@@ -317,7 +317,7 @@
 #define TARGET_NR_epoll_pwait	315
 #define TARGET_NR_utimensat		316
 #define TARGET_NR_signalfd		317
-#define TARGET_NR_timerfd		318
+#define TARGET_NR_timerfd_create	318
 #define TARGET_NR_eventfd		319
 #define TARGET_NR_fallocate		320
 #define TARGET_NR_timerfd_settime	321
diff --git a/linux-user/ppc/syscall_nr.h b/linux-user/ppc/syscall_nr.h
index 0a5fd54..46ed8a6 100644
--- a/linux-user/ppc/syscall_nr.h
+++ b/linux-user/ppc/syscall_nr.h
@@ -319,7 +319,7 @@
 #define TARGET_NR_epoll_pwait	303
 #define TARGET_NR_utimensat		304
 #define TARGET_NR_signalfd		305
-#define TARGET_NR_timerfd		306
+#define TARGET_NR_timerfd_create	306
 #define TARGET_NR_eventfd		307
 #define TARGET_NR_sync_file_range2	308
 #define TARGET_NR_fallocate		309
diff --git a/linux-user/sh4/syscall_nr.h b/linux-user/sh4/syscall_nr.h
index bdf8742..5009984 100644
--- a/linux-user/sh4/syscall_nr.h
+++ b/linux-user/sh4/syscall_nr.h
@@ -323,7 +323,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
diff --git a/linux-user/sparc/syscall_nr.h b/linux-user/sparc/syscall_nr.h
index 5b582a5..732b105 100644
--- a/linux-user/sparc/syscall_nr.h
+++ b/linux-user/sparc/syscall_nr.h
@@ -278,7 +278,7 @@
 #define TARGET_NR_epoll_pwait	309
 #define TARGET_NR_utimensat		310
 #define TARGET_NR_signalfd		311
-#define TARGET_NR_timerfd		312
+#define TARGET_NR_timerfd_create	312
 #define TARGET_NR_eventfd		313
 #define TARGET_NR_fallocate		314
 #define TARGET_NR_timerfd_settime	315
diff --git a/linux-user/x86_64/syscall_nr.h b/linux-user/x86_64/syscall_nr.h
index f00fa2b..16397b3 100644
--- a/linux-user/x86_64/syscall_nr.h
+++ b/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
-- 
2.7.0

  parent reply	other threads:[~2016-02-19 13:42 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-19 13:42 [Qemu-devel] [PULL 0/8] linux-user update riku.voipio
2016-02-19 13:42 ` [Qemu-devel] [PULL 1/8] linux-user: fix realloc size of target_fd_trans riku.voipio
2016-02-19 13:42 ` [Qemu-devel] [PULL 2/8] build: [linux-user] Rename "syscall.h" to "target_syscall.h" in target directories riku.voipio
2016-02-19 13:42 ` [Qemu-devel] [PULL 3/8] linux-user: set ppc64/ppc64le default CPU to POWER8 riku.voipio
2016-02-19 13:42 ` [Qemu-devel] [PULL 4/8] linux-user: add getrandom() syscall riku.voipio
2016-02-19 13:42 ` [Qemu-devel] [PULL 5/8] linux-user: Don't assert if guest tries shmdt(0) riku.voipio
2016-02-19 13:42 ` [Qemu-devel] [PULL 6/8] linux-user: sync syscall numbers with kernel riku.voipio
2016-02-19 13:42 ` [Qemu-devel] [PULL 7/8] linux-user: remove unavailable syscalls from aarch64 riku.voipio
2016-02-19 13:42 ` riku.voipio [this message]
2016-02-19 16:42 ` [Qemu-devel] [PULL 0/8] linux-user update Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=eaba57cb8145afd3e93bc7cc556a3ba7daad6c40.1455888929.git.riku.voipio@linaro.org \
    --to=riku.voipio@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.