From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StN2T-0003Qs-BL for qemu-devel@nongnu.org; Mon, 23 Jul 2012 14:07:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StN2S-0002Gf-3Y for qemu-devel@nongnu.org; Mon, 23 Jul 2012 14:07:25 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:46160) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StN2R-0002GR-SV for qemu-devel@nongnu.org; Mon, 23 Jul 2012 14:07:24 -0400 From: Peter Maydell Date: Mon, 23 Jul 2012 19:07:22 +0100 Message-Id: <1343066842-21920-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] linux-user: Move target_to_host_errno_table[] setup out of ioctl loop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Riku Voipio , patches@linaro.org The code to initialise the target_to_host_errno_table[] array was accidentally inside the loop through checking and initialising all the supported ioctls. This was harmless but meant that we reinitialised the array several hundred times on startup. Signed-off-by: Peter Maydell --- The code seems to have been incorrectly placed like this since it was first committed... linux-user/syscall.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 539af3f..9f9ad9a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4594,6 +4594,11 @@ 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; + /* 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 */ ie = ioctl_entries; @@ -4613,11 +4618,6 @@ void syscall_init(void) (size << TARGET_IOC_SIZESHIFT); } - /* 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; - /* automatic consistency check if same arch */ #if (defined(__i386__) && defined(TARGET_I386) && defined(TARGET_ABI32)) || \ (defined(__x86_64__) && defined(TARGET_X86_64)) -- 1.7.5.4