From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X9ojn-000898-4i for qemu-devel@nongnu.org; Wed, 23 Jul 2014 01:05:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X9oje-00013F-J5 for qemu-devel@nongnu.org; Wed, 23 Jul 2014 01:05:09 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:53030) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X9oje-0000wn-E9 for qemu-devel@nongnu.org; Wed, 23 Jul 2014 01:05:02 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N9500AJ8FFSQE70@mailout2.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 23 Jul 2014 06:04:40 +0100 (BST) Message-id: <53CF4278.7070101@samsung.com> Date: Wed, 23 Jul 2014 09:04:56 +0400 From: Mikhail Ilin MIME-version: 1.0 References: <20140722064729.20624.54307.malonedeb@wampee.canonical.com> <20140722085151.9110.11343.malone@gac.canonical.com> In-reply-to: <20140722085151.9110.11343.malone@gac.canonical.com> Content-type: text/plain; charset=UTF-8; format=flowed Content-transfer-encoding: 7bit Subject: Re: [Qemu-devel] [Bug 1346769] Re: /proc/self/maps content returned to 32-bits guest under 64-bits qemu List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org, 'Yury Gribov' , Slava Garbuzov On 22.07.2014 12:51, Peter Maydell wrote: > I think the ifdefs are just accident of history and we can safely remove > them. > Good, let make a fix. From 719f4e66b134a043dabdf5f6cb6d40445a53e071 Mon Sep 17 00:00:00 2001 From: Mikhail Ilyin Date: Wed, 23 Jul 2014 08:49:09 +0400 Subject: [PATCH] Remove target specific ifdefs which are not relevant any more. Signed-off-by: Mikhail Ilyin --- linux-user/syscall.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a50229d..09bbc44 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5092,10 +5092,8 @@ static int open_self_cmdline(void *cpu_env, int fd) static int open_self_maps(void *cpu_env, int fd) { -#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32) CPUState *cpu = ENV_GET_CPU((CPUArchState *)cpu_env); TaskState *ts = cpu->opaque; -#endif FILE *fp; char *line = NULL; size_t len = 0; @@ -5133,13 +5131,11 @@ static int open_self_maps(void *cpu_env, int fd) free(line); fclose(fp); -#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32) dprintf(fd, "%08llx-%08llx rw-p %08llx 00:00 0 [stack]\n", (unsigned long long)ts->info->stack_limit, (unsigned long long)(ts->info->start_stack + (TARGET_PAGE_SIZE - 1)) & TARGET_PAGE_MASK, (unsigned long long)0); -#endif return 0; } -- 1.9.1