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

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
2e77eac6 · blueswir1 · 48927926 · 2e77eac6 · 2e77eac6
隐藏空白更改
内联并排

Showing with 30 addition and 26 deletion

bsd-user/main.c bsd-user/main.c +15 -13

linux-user/main.c linux-user/main.c +15 -13

未找到文件。
--- 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();

--- 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();