[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 21/39] bsd-user: Expand log_page_dump inline
From: |
Richard Henderson |
Subject: |
[PATCH v3 21/39] bsd-user: Expand log_page_dump inline |
Date: |
Sun, 17 Apr 2022 11:30:01 -0700 |
We have extra stuff to log at the same time.
Hoist the qemu_log_trylock/unlock to the caller and use fprintf.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/main.c | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 0c8aa1ae90..ed26fc5acb 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -503,20 +503,29 @@ 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_trylock();
+ if (f) {
+ fprintf(f, "guest_base %p\n", (void *)guest_base);
+ fprintf(f, "page layout changed following binary load\n");
+ page_dump(f);
- 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);
+ 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);
+ fprintf(f, "start_data 0x" TARGET_ABI_FMT_lx "\n",
+ info->start_data);
+ 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);
+ 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
- [PATCH v3 16/39] util/log: Use qemu_log_trylock/unlock in qemu_log, (continued)
- [PATCH v3 16/39] util/log: Use qemu_log_trylock/unlock in qemu_log, Richard Henderson, 2022/04/17
- [PATCH v3 17/39] util/log: Drop return value from qemu_log, Richard Henderson, 2022/04/17
- [PATCH v3 25/39] include/qemu/log: Move entire implementation out-of-line, Richard Henderson, 2022/04/17
- [PATCH v3 27/39] util/log: Introduce qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 32/39] util/log: Rename logfilename to global_filename, Richard Henderson, 2022/04/17
- [PATCH v3 37/39] util/log: Rename QemuLogFile to RCUCloseFILE, Richard Henderson, 2022/04/17
- [PATCH v3 13/39] exec/log: Remove log_disas and log_target_disas, Richard Henderson, 2022/04/17
- [PATCH v3 07/39] util/log: Rename qemu_log_lock to qemu_log_trylock, Richard Henderson, 2022/04/17
- [PATCH v3 22/39] linux-user: Expand log_page_dump inline, Richard Henderson, 2022/04/17
- [PATCH v3 23/39] tests/unit: Do not reference QemuLogFile directly, Richard Henderson, 2022/04/17
- [PATCH v3 21/39] bsd-user: Expand log_page_dump inline,
Richard Henderson <=
- [PATCH v3 26/39] sysemu/os-win32: Test for and use _lock_file/_unlock_file, Richard Henderson, 2022/04/17
- [PATCH v3 19/39] util/log: Remove qemu_log_flush, Richard Henderson, 2022/04/17
- [PATCH v3 30/39] softmmu: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 31/39] util/log: Remove qemu_log_close, Richard Henderson, 2022/04/17
- [PATCH v3 28/39] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 02/39] target/hexagon: Remove qemu_set_log in hexagon_translate_init, Richard Henderson, 2022/04/17
- [PATCH v3 04/39] util/log: Pass Error pointer to qemu_set_log, Richard Henderson, 2022/04/17
- [PATCH v3 15/39] target/nios2: Remove log_cpu_state from reset, Richard Henderson, 2022/04/17
- [PATCH v3 24/39] include/exec/log: Do not reference QemuLogFile directly, Richard Henderson, 2022/04/17