From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 11/14] linux-user: Remove duplicate CPU_LOG_PAGE from probe_guest_base
Date: Tue, 8 Aug 2023 14:08:53 -0700 [thread overview]
Message-ID: <20230808210856.95568-12-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230808210856.95568-1-richard.henderson@linaro.org>
The proper logging for probe_guest_base is in the main function.
There is no need to duplicate that in the subroutines.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/elfload.c | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index fb137345f6..c14139a5fc 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2560,9 +2560,6 @@ static void pgb_have_guest_base(const char *image_name, abi_ulong guest_loaddr,
if (test != addr) {
pgb_fail_in_use(image_name);
}
- qemu_log_mask(CPU_LOG_PAGE,
- "%s: base @ %p for %" PRIu64 " bytes\n",
- __func__, addr, (uint64_t)guest_hiaddr - guest_loaddr + 1);
}
/**
@@ -2605,9 +2602,6 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t guest_size, uintptr_t brk,
if (mmap_start != MAP_FAILED) {
munmap(mmap_start, guest_size);
if (mmap_start == (void *) align_start) {
- qemu_log_mask(CPU_LOG_PAGE,
- "%s: base @ %p for %" PRIdPTR" bytes\n",
- __func__, mmap_start + offset, guest_size);
return (uintptr_t) mmap_start + offset;
}
}
@@ -2689,13 +2683,6 @@ static uintptr_t pgb_find_hole(uintptr_t guest_loaddr, uintptr_t guest_size,
}
}
free_self_maps(maps);
-
- if (ret != -1) {
- qemu_log_mask(CPU_LOG_PAGE, "%s: base @ %" PRIxPTR
- " for %" PRIuPTR " bytes\n",
- __func__, ret, guest_size);
- }
-
return ret;
}
@@ -2747,9 +2734,6 @@ static void pgb_static(const char *image_name, abi_ulong orig_loaddr,
}
guest_base = addr;
-
- qemu_log_mask(CPU_LOG_PAGE, "%s: base @ %"PRIxPTR" for %" PRIuPTR" bytes\n",
- __func__, addr, hiaddr - loaddr);
}
static void pgb_dynamic(const char *image_name, long align)
@@ -2807,9 +2791,6 @@ static void pgb_reserved_va(const char *image_name, abi_ulong guest_loaddr,
reserved_va + 1, test, strerror(errno));
exit(EXIT_FAILURE);
}
-
- qemu_log_mask(CPU_LOG_PAGE, "%s: base @ %p for %lu bytes\n",
- __func__, addr, reserved_va + 1);
}
void probe_guest_base(const char *image_name, abi_ulong guest_loaddr,
--
2.34.1
next prev parent reply other threads:[~2023-08-08 21:11 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-08 21:08 [PULL 00/14] linux-user image mapping fixes Richard Henderson
2023-08-08 21:08 ` [PULL 01/14] linux-user: Adjust task_unmapped_base for reserved_va Richard Henderson
2023-08-08 21:08 ` [PULL 02/14] linux-user: Define TASK_UNMAPPED_BASE in $guest/target_mman.h Richard Henderson
2023-08-08 21:08 ` [PULL 03/14] linux-user: Define ELF_ET_DYN_BASE " Richard Henderson
2023-08-08 21:08 ` [PULL 04/14] linux-user: Use MAP_FIXED_NOREPLACE for initial image mmap Richard Henderson
2023-08-08 21:08 ` [PULL 05/14] linux-user: Use elf_et_dyn_base for ET_DYN with interpreter Richard Henderson
2023-08-08 21:08 ` [PULL 06/14] linux-user: Adjust initial brk when interpreter is close to executable Richard Henderson
2023-08-08 21:08 ` [PULL 07/14] linux-user: Do not adjust image mapping for host page size Richard Henderson
2023-08-08 21:08 ` [PULL 08/14] linux-user: Do not adjust zero_bss " Richard Henderson
2023-08-08 21:08 ` [PULL 09/14] linux-user: Use zero_bss for PT_LOAD with no file contents too Richard Henderson
2023-08-08 21:08 ` [PULL 10/14] util/selfmap: Rewrite using qemu/interval-tree.h Richard Henderson
2023-08-08 21:08 ` Richard Henderson [this message]
2023-08-08 21:08 ` [PULL 12/14] linux-user: Consolidate guest bounds check in probe_guest_base Richard Henderson
2023-08-08 21:08 ` [PULL 13/14] linux-user: Rewrite fixed probe_guest_base Richard Henderson
2023-08-08 21:08 ` [PULL 14/14] linux-user: Rewrite non-fixed probe_guest_base Richard Henderson
2023-08-08 23:38 ` [PULL 00/14] linux-user image mapping fixes Richard Henderson
2023-08-15 13:51 ` Michael Tokarev
2023-08-15 21:09 ` Richard Henderson
2023-08-15 21:42 ` Helge Deller
2023-08-16 6:17 ` Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230808210856.95568-12-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).