Fix user emulator breakage, based on patch by Riku Voipio

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6371 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/bsd-user/main.c b/bsd-user/main.c
index b809f43..7d0d4b3 100644 (file)
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -533,19 +533,21 @@ int main(int argc, char **argv)
 
     free(target_environ);
 
-    log_page_dump();
-
-    qemu_log("start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
-    qemu_log("end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code);
-    qemu_log("start_code  0x" TARGET_ABI_FMT_lx "\n",
-            info->start_code);
-    qemu_log("start_data  0x" TARGET_ABI_FMT_lx "\n",
-            info->start_data);
-    qemu_log("end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data);
-    qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n",
-            info->start_stack);
-    qemu_log("brk         0x" TARGET_ABI_FMT_lx "\n", info->brk);
-    qemu_log("entry       0x" TARGET_ABI_FMT_lx "\n", info->entry);
+    if (qemu_log_enabled()) {
+        log_page_dump();
+
+        qemu_log("start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
+        qemu_log("end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code);
+        qemu_log("start_code  0x" TARGET_ABI_FMT_lx "\n",
+                 info->start_code);
+        qemu_log("start_data  0x" TARGET_ABI_FMT_lx "\n",
+                 info->start_data);
+        qemu_log("end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data);
+        qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n",
+                 info->start_stack);
+        qemu_log("brk         0x" TARGET_ABI_FMT_lx "\n", info->brk);
+        qemu_log("entry       0x" TARGET_ABI_FMT_lx "\n", info->entry);
+    }
 
     target_set_brk(info->brk);
     syscall_init();

diff --git a/linux-user/main.c b/linux-user/main.c
index 5685b37..732524f 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2394,19 +2394,21 @@ int main(int argc, char **argv, char **envp)
 
     free(target_environ);
 
-    log_page_dump();
-
-    qemu_log("start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
-    qemu_log("end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code);
-    qemu_log("start_code  0x" TARGET_ABI_FMT_lx "\n",
-            info->start_code);
-    qemu_log("start_data  0x" TARGET_ABI_FMT_lx "\n",
-            info->start_data);
-    qemu_log("end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data);
-    qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n",
-            info->start_stack);
-    qemu_log("brk         0x" TARGET_ABI_FMT_lx "\n", info->brk);
-    qemu_log("entry       0x" TARGET_ABI_FMT_lx "\n", info->entry);
+    if (qemu_log_enabled()) {
+        log_page_dump();
+
+        qemu_log("start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
+        qemu_log("end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code);
+        qemu_log("start_code  0x" TARGET_ABI_FMT_lx "\n",
+                 info->start_code);
+        qemu_log("start_data  0x" TARGET_ABI_FMT_lx "\n",
+                 info->start_data);
+        qemu_log("end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data);
+        qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n",
+                 info->start_stack);
+        qemu_log("brk         0x" TARGET_ABI_FMT_lx "\n", info->brk);
+        qemu_log("entry       0x" TARGET_ABI_FMT_lx "\n", info->entry);
+    }
 
     target_set_brk(info->brk);
     syscall_init();