From patchwork Fri Feb 19 13:42:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 8361161 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D1EBDC0553 for ; Fri, 19 Feb 2016 13:43:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1617B20443 for ; Fri, 19 Feb 2016 13:43:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CFEE2042B for ; Fri, 19 Feb 2016 13:43:10 +0000 (UTC) Received: from localhost ([::1]:52388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWlKv-0000bp-Nj for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Feb 2016 08:43:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWlKc-0000Ug-RU for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:42:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWlKb-0004dM-Q4 for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:42:50 -0500 Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]:33973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWlKb-0004d6-DX for qemu-devel@nongnu.org; Fri, 19 Feb 2016 08:42:49 -0500 Received: by mail-lf0-x22b.google.com with SMTP id j78so53945660lfb.1 for ; Fri, 19 Feb 2016 05:42:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Guv5kNTvFLzQpTP82vr2McNqubfbv2fyrnNhx4SjQE4=; b=TuH492g/gcr1KCRqIpCVAivL6yc+TMuZIa9qs02tMnW8e+sCfXQeq7JQM5xtdr6GxY N5eaPATlqxdR35oz7IhhkBIUNoIqm4SYz8oaEqW4pIdRsDhas+UDLVJZpp76VtUZIYxh 9ndWuXuOnFJMe8IrQSrVS8lslReDsEkAcc37I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Guv5kNTvFLzQpTP82vr2McNqubfbv2fyrnNhx4SjQE4=; b=dHx5msrGuhDhdhhJhwU3YA5aGGCgNXn1F+NSrJaUwjbaIKG7wGUUV1FWTtnPcqHuCK ExzPDzDim5d7VUXYK7I91C+xIucaPzlXLpwChc0lkZJnPWXoQ17yCXxRNnJeo4LQubrn 5p/8SWblM+UdTbjM5wLBQoQYWCYckO2YmSE11JJHiZdBeqLxQZVNqXt9yIVccTzcXHnV GSX6zM85aKWcAc6zZZKhbsI0DKfvbky387yb7YyDJ9qytDan3vJVHhtzqQmClwpYc/8k Cy5QlWRpMhz7DCm4PGL8/iUqVSQeG83tvX1lM/jDMEkkaVxMONIvTwfGvB9LjZ1QLpB8 dVBg== X-Gm-Message-State: AG10YOTv5cgsqK7tb9XHt2a9qR+MaKnoN1YT+ONrPtq0mPvnqolW7LA8seDaQrYDOquOEOQ4 X-Received: by 10.25.15.23 with SMTP id e23mr5264202lfi.111.1455889368623; Fri, 19 Feb 2016 05:42:48 -0800 (PST) Received: from localhost.localdomain (91-157-175-207.elisa-laajakaista.fi. [91.157.175.207]) by smtp.gmail.com with ESMTPSA id o184sm1557417lfb.15.2016.02.19.05.42.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Feb 2016 05:42:47 -0800 (PST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 19 Feb 2016 15:42:29 +0200 Message-Id: <0ec3bac76a0ad3a2a6f546379bdf8e73f9ab106e.1455888929.git.riku.voipio@linaro.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::22b Cc: Riku Voipio Subject: [Qemu-devel] [PULL 7/8] linux-user: remove unavailable syscalls from aarch64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Riku Voipio QEMU lists deprecated system call numbers in for Aarch64. These are never enabled for Linux kernel, so don't define them in Qemu either. Remove the ifdef around host_to_target_stat64 since all architectures need it now. Reviewed-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/aarch64/syscall_nr.h | 59 ----------------------------------------- linux-user/syscall.c | 2 -- 2 files changed, 61 deletions(-) diff --git a/linux-user/aarch64/syscall_nr.h b/linux-user/aarch64/syscall_nr.h index c8a8599..59511d8 100644 --- a/linux-user/aarch64/syscall_nr.h +++ b/linux-user/aarch64/syscall_nr.h @@ -275,62 +275,3 @@ #define TARGET_NR_mlock2 284 #define TARGET_NR_copy_file_range 285 -#define TARGET_NR_open 1024 -#define TARGET_NR_link 1025 -#define TARGET_NR_unlink 1026 -#define TARGET_NR_mknod 1027 -#define TARGET_NR_chmod 1028 -#define TARGET_NR_chown 1029 -#define TARGET_NR_mkdir 1030 -#define TARGET_NR_rmdir 1031 -#define TARGET_NR_lchown 1032 -#define TARGET_NR_access 1033 -#define TARGET_NR_rename 1034 -#define TARGET_NR_readlink 1035 -#define TARGET_NR_symlink 1036 -#define TARGET_NR_utimes 1037 -#define TARGET_NR_stat 1038 -#define TARGET_NR_lstat 1039 -#define TARGET_NR_pipe 1040 -#define TARGET_NR_dup2 1041 -#define TARGET_NR_epoll_create 1042 -#define TARGET_NR_inotify_init 1043 -#define TARGET_NR_eventfd 1044 -#define TARGET_NR_signalfd 1045 -#define TARGET_NR_sendfile64 1046 -#define TARGET_NR_ftruncate64 1047 -#define TARGET_NR_truncate64 1048 -#define TARGET_NR_stat64 1049 -#define TARGET_NR_lstat64 1050 -#define TARGET_NR_fstat64 1051 -#define TARGET_NR_fcntl64 1052 -/* #define TARGET_NR_fadvise64 1053 */ -#define TARGET_NR_newfstatat 1054 -#define TARGET_NR_fstatfs64 1055 -#define TARGET_NR_statfs64 1056 -#define TARGET_NR_lseek64 1057 -#define TARGET_NR_mmap64 1058 -#define TARGET_NR_alarm 1059 -#define TARGET_NR_getpgrp 1060 -#define TARGET_NR_pause 1061 -#define TARGET_NR_time 1062 -#define TARGET_NR_utime 1063 -#define TARGET_NR_creat 1064 -#define TARGET_NR_getdents 1065 -#define TARGET_NR_futimesat 1066 -#define TARGET_NR_select 1067 -#define TARGET_NR_poll 1068 -#define TARGET_NR_epoll_wait 1069 -#define TARGET_NR_ustat 1070 -#define TARGET_NR_vfork 1071 -#define TARGET_NR_oldwait4 1072 -#define TARGET_NR_recv 1073 -#define TARGET_NR_send 1074 -#define TARGET_NR_bdflush 1075 -#define TARGET_NR_umount 1076 -#define TARGET_NR_uselib 1077 -#define TARGET_NR__sysctl 1078 -#define TARGET_NR_fork 1079 -#define TARGET_NR_syscalls (__NR_fork+1) - -#define TARGET_NR_sigreturn 1999 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 83b881c..9781e1d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5234,7 +5234,6 @@ static inline int target_to_host_mlockall_arg(int arg) } #endif -#if defined(TARGET_NR_stat64) || defined(TARGET_NR_newfstatat) static inline abi_long host_to_target_stat64(void *cpu_env, abi_ulong target_addr, struct stat *host_st) @@ -5297,7 +5296,6 @@ static inline abi_long host_to_target_stat64(void *cpu_env, return 0; } -#endif /* ??? Using host futex calls even when target atomic operations are not really atomic probably breaks things. However implementing