Re: [Qemu-devel] [Bug 1346769] Re: /proc/self/maps content returned to 32-bits guest under 64-bits qemu

[Mikhail Ilin]

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 <address@hidden>
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 <address@hidden>
---
 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