qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
	"Helge Deller" <deller@gmx.de>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Taylor Simpson" <tsimpson@quicinc.com>,
	"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PATCH 10/12] linux-user/syscall: Refactor target_to_host_errno_table_init()
Date: Sun,  4 Jul 2021 20:37:53 +0200	[thread overview]
Message-ID: <20210704183755.655002-11-f4bug@amsat.org> (raw)
In-Reply-To: <20210704183755.655002-1-f4bug@amsat.org>

To be able to move the errno handling code out of syscall.c,
first refactor the target_to_host_errno_table[] initialization
as a new init() function.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 linux-user/syscall.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 64bbf331b28..33b7fef12a8 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -509,8 +509,10 @@ static inline int next_free_host_timer(void)
 
 #define ERRNO_TABLE_SIZE 1200
 
-/* target_to_host_errno_table[] is initialized from
- * host_to_target_errno_table[] in syscall_init(). */
+/*
+ * target_to_host_errno_table[] is initialized from
+ * host_to_target_errno_table[] in target_to_host_errno_table_init().
+ */
 static uint16_t target_to_host_errno_table[ERRNO_TABLE_SIZE] = {
 };
 
@@ -637,6 +639,17 @@ static uint16_t host_to_target_errno_table[ERRNO_TABLE_SIZE] = {
 #endif
 };
 
+static void target_to_host_errno_table_init(void)
+{
+    /*
+     * Build target_to_host_errno_table[] table
+     * from host_to_target_errno_table[].
+     */
+    for (int i = 0; i < ERRNO_TABLE_SIZE; i++) {
+        target_to_host_errno_table[host_to_target_errno_table[i]] = i;
+    }
+}
+
 static inline int host_to_target_errno(int err)
 {
     if (err >= 0 && err < ERRNO_TABLE_SIZE &&
@@ -7102,7 +7115,6 @@ void syscall_init(void)
     IOCTLEntry *ie;
     const argtype *arg_type;
     int size;
-    int i;
 
     thunk_init(STRUCT_MAX);
 
@@ -7112,11 +7124,7 @@ void syscall_init(void)
 #undef STRUCT
 #undef STRUCT_SPECIAL
 
-    /* Build target_to_host_errno_table[] table from
-     * host_to_target_errno_table[]. */
-    for (i = 0; i < ERRNO_TABLE_SIZE; i++) {
-        target_to_host_errno_table[host_to_target_errno_table[i]] = i;
-    }
+    target_to_host_errno_table_init();
 
     /* we patch the ioctl size if necessary. We rely on the fact that
        no ioctl has all the bits at '1' in the size field */
-- 
2.31.1



  parent reply	other threads:[~2021-07-04 18:49 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-04 18:37 [PATCH 00/12] linux-user: Extract target errno related functions to 'target_errno.h' Philippe Mathieu-Daudé
2021-07-04 18:37 ` [PATCH 01/12] linux-user/alpha: Handle TARGET_EWOULDBLOCK as TARGET_EAGAIN Philippe Mathieu-Daudé
2021-07-07  1:44   ` Richard Henderson
2021-07-07 19:25   ` Laurent Vivier
2021-07-04 18:37 ` [PATCH 02/12] linux-user/hppa: " Philippe Mathieu-Daudé
2021-07-07  1:44   ` Richard Henderson
2021-07-07 19:26   ` Laurent Vivier
2021-07-04 18:37 ` [PATCH 03/12] linux-user/mips: " Philippe Mathieu-Daudé
2021-07-07  1:45   ` Richard Henderson
2021-07-07 19:27   ` Laurent Vivier
2021-07-04 18:37 ` [PATCH 04/12] linux-user/sparc: Rename target_errno.h -> target_errno_defs.h Philippe Mathieu-Daudé
2021-07-07 19:29   ` Laurent Vivier
2021-07-04 18:37 ` [PATCH 05/12] linux-user: Extract target errno to 'target_errno_defs.h' Philippe Mathieu-Daudé
2021-07-05 22:32   ` Taylor Simpson
2021-07-07  1:53   ` Richard Henderson
2021-07-08  8:32     ` Philippe Mathieu-Daudé
2021-07-04 18:37 ` [PATCH 06/12] linux-user/alpha: Remove hardcoded tabs (code style) Philippe Mathieu-Daudé
2021-07-07  1:46   ` Richard Henderson
2021-07-07 19:32   ` Laurent Vivier
2021-07-04 18:37 ` [PATCH 07/12] linux-user/alpha: Move errno definitions to 'target_errno_defs.h' Philippe Mathieu-Daudé
2021-07-04 18:37 ` [PATCH 08/12] linux-user/hppa: " Philippe Mathieu-Daudé
2021-07-04 18:37 ` [PATCH 09/12] linux-user/mips: " Philippe Mathieu-Daudé
2021-07-04 18:37 ` Philippe Mathieu-Daudé [this message]
2021-07-04 18:37 ` [PATCH 11/12] linux-user/syscall: Remove hardcoded tabs (code style) Philippe Mathieu-Daudé
2021-07-07 19:34   ` Laurent Vivier
2021-07-04 18:37 ` [PATCH 12/12] linux-user: Extract target errno related functions to 'target_errno.h' Philippe Mathieu-Daudé
2021-07-05 22:29   ` Taylor Simpson
2021-07-07  2:08   ` Richard Henderson

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=20210704183755.655002-11-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=aleksandar.rikalo@syrmia.com \
    --cc=aurelien@aurel32.net \
    --cc=deller@gmx.de \
    --cc=laurent@vivier.eu \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=tsimpson@quicinc.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).