From nobody Fri May 3 05:10:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496217566952756.8331326713728; Wed, 31 May 2017 00:59:26 -0700 (PDT) Received: from localhost ([::1]:57787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFyXM-0003Zc-RV for importer@patchew.org; Wed, 31 May 2017 03:59:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFyWZ-00039g-9h for qemu-devel@nongnu.org; Wed, 31 May 2017 03:58:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dFyWW-0003jl-N8 for qemu-devel@nongnu.org; Wed, 31 May 2017 03:58:35 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:47312) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dFyWW-0003jM-Fx for qemu-devel@nongnu.org; Wed, 31 May 2017 03:58:32 -0400 Received: from sf.home (host81-154-9-172.range81-154.btcentralplus.com [81.154.9.172]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: slyfox) by smtp.gentoo.org (Postfix) with ESMTPSA id DEA4634172D; Wed, 31 May 2017 07:58:29 +0000 (UTC) Received: by sf.home (Postfix, from userid 1000) id D25E61B5AD52A; Wed, 31 May 2017 08:58:25 +0100 (BST) From: Sergei Trofimovich To: Peter Maydell Date: Wed, 31 May 2017 08:58:14 +0100 Message-Id: <20170531075814.4851-1-slyfox@gentoo.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 140.211.166.183 Subject: [Qemu-devel] [PATCH v2] alpha-user: wire epoll_create, epoll_ctl, epoll_wait X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , qemu-devel@nongnu.org, Sergei Trofimovich Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Noticed when ran GHC on alpha: $ qemu-alpha -L /usr/alpha-unknown-linux-gnu/ /tmp/a qemu: Unsupported syscall: 407 linux-user/syscall.c does have 'epoll_create' wiring, but under nondeprecated name. Instead of defining both TARGET_NR_sys_epoll_create and TARGET_NR_epoll_create I've renamed former to later as old name is not used anywhere else in qemu (except the linux-user/strace.list). After this change GHC works fine under qemu-alpha: $ ./alpha-linux-user/qemu-alpha -L /usr/alpha-unknown-linux-gnu/ /tmp/a ... Cc: Riku Voipio Cc: qemu-devel@nongnu.org Reviewed-by: Peter Maydell Signed-off-by: Sergei Trofimovich --- Change since v1: - cleaned up 'linux-user/strace.list' from deprecated defines linux-user/alpha/syscall_nr.h | 6 +++--- linux-user/strace.list | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/linux-user/alpha/syscall_nr.h b/linux-user/alpha/syscall_nr.h index 00e14bb6b3..e848154663 100644 --- a/linux-user/alpha/syscall_nr.h +++ b/linux-user/alpha/syscall_nr.h @@ -343,9 +343,9 @@ #define TARGET_NR_io_cancel 402 #define TARGET_NR_exit_group 405 #define TARGET_NR_lookup_dcookie 406 -#define TARGET_NR_sys_epoll_create 407 -#define TARGET_NR_sys_epoll_ctl 408 -#define TARGET_NR_sys_epoll_wait 409 +#define TARGET_NR_epoll_create 407 +#define TARGET_NR_epoll_ctl 408 +#define TARGET_NR_epoll_wait 409 #define TARGET_NR_remap_file_pages 410 #define TARGET_NR_set_tid_address 411 #define TARGET_NR_restart_syscall 412 diff --git a/linux-user/strace.list b/linux-user/strace.list index 3b1282ec1a..ccfb58b7f4 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -1467,15 +1467,6 @@ #ifdef TARGET_NR__sysctl { TARGET_NR__sysctl, "_sysctl" , NULL, NULL, NULL }, #endif -#ifdef TARGET_NR_sys_epoll_create -{ TARGET_NR_sys_epoll_create, "sys_epoll_create" , NULL, NULL, NULL }, -#endif -#ifdef TARGET_NR_sys_epoll_ctl -{ TARGET_NR_sys_epoll_ctl, "sys_epoll_ctl" , NULL, NULL, NULL }, -#endif -#ifdef TARGET_NR_sys_epoll_wait -{ TARGET_NR_sys_epoll_wait, "sys_epoll_wait" , NULL, NULL, NULL }, -#endif #ifdef TARGET_NR_sysfs { TARGET_NR_sysfs, "sysfs" , NULL, NULL, NULL }, #endif --=20 2.13.0