[PULL for-7.1 18/36] bsd-user: Expand log_page_dump inline

[Richard Henderson]

We have extra stuff to log at the same time.
Hoist the qemu_log_lock/unlock to the caller and use fprintf.

Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
 bsd-user/main.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/bsd-user/main.c b/bsd-user/main.c
index 0c8aa1ae90..d25d1c6015 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -503,20 +503,25 @@ int main(int argc, char **argv)
     g_free(target_environ);
 
     if (qemu_loglevel_mask(CPU_LOG_PAGE)) {
-        qemu_log("guest_base  %p\n", (void *)guest_base);
-        log_page_dump("binary load");
+        FILE *f = qemu_log_lock();
 
-        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",
+        fprintf(f, "guest_base  %p\n", (void *)guest_base);
+        fprintf(f, "page layout changed following binary load\n");
+        page_dump(f);
+
+        fprintf(f, "start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
+        fprintf(f, "end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code);
+        fprintf(f, "start_code  0x" TARGET_ABI_FMT_lx "\n",
                  info->start_code);
-        qemu_log("start_data  0x" TARGET_ABI_FMT_lx "\n",
+        fprintf(f, "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",
+        fprintf(f, "end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data);
+        fprintf(f, "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);
+        fprintf(f, "brk         0x" TARGET_ABI_FMT_lx "\n", info->brk);
+        fprintf(f, "entry       0x" TARGET_ABI_FMT_lx "\n", info->entry);
+
+        qemu_log_unlock(f);
     }
 
     /* build Task State */
-- 
2.25.1