Hi,
On 25/1/24 03:33, Xiaoyao Li wrote:
Use __func__ to avoid hard-coded function name.
Signed-off-by: Xiaoyao Li <xiaoyao...@intel.com>
Reviewed-by: David Hildenbrand <da...@redhat.com>
---
system/physmem.c | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
if ((start + length) <= rb->max_length) {
bool need_madvise, need_fallocate;
if (!QEMU_IS_ALIGNED(length, rb->page_size)) {
- error_report("ram_block_discard_range: Unaligned length: %zx",
- length);
+ error_report("%s: Unaligned length: %zx", __func__, length);
Pre-existing, should we enforce 0x prefix for %*x format?
See https://www.qemu.org/docs/master/devel/style.html#printf-flag
and related commit c3e5875afc ("checkpatch: check trace-events code
style") for rationale.
$ git grep '[^x]%zx'
accel/tcg/perf.c:239: fprintf(perfmap, "%"PRIxPTR" %zx
tcg-prologue-buffer\n",
gdbstub/user-target.c:300: g_string_printf(gdbserver_state.str_buf,
"F%zx;", n);
migration/postcopy-ram.c:759: error_report("%s: Failed to wake:
%zx in %s (%s)",
migration/trace-events:100:ram_discard_range(const char *rbname,
uint64_t start, size_t len) "%s: start: %" PRIx64 " %zx"
system/physmem.c:3511: error_report("ram_block_discard_range:
Unaligned length: %zx",
system/physmem.c:3564: "%s:%" PRIx64 " +%zx
(%d)",
system/physmem.c:3571: "%s:%" PRIx64 " +%zx (%d)",
system/physmem.c:3591: "%s:%" PRIx64 " +%zx
(%d)",
system/physmem.c:3598: "%s:%" PRIx64 " +%zx (%d)",
system/physmem.c:3607: "/%zx/" RAM_ADDR_FMT")",
if (ret) {
ret = -errno;
- error_report("ram_block_discard_range: Failed to fallocate "
- "%s:%" PRIx64 " +%zx (%d)",
- rb->idstr, start, length, ret);
+ error_report("%s: Failed to fallocate %s:%" PRIx64 " +%zx
(%d)",
+ __func__, rb->idstr, start, length, ret);
goto err;
}
#else
ret = -ENOSYS;
- error_report("ram_block_discard_range: fallocate not
available/file"
+ error_report("%s: fallocate not available/file"
"%s:%" PRIx64 " +%zx (%d)",
- rb->idstr, start, length, ret);
+ __func__, rb->idstr, start, length, ret);
goto err;
#endif
}
@@ -3587,25 +3585,23 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t
start, size_t length)
}
if (ret) {
ret = -errno;
- error_report("ram_block_discard_range: Failed to discard range
"
+ error_report("%s: Failed to discard range "
"%s:%" PRIx64 " +%zx (%d)",
- rb->idstr, start, length, ret);
+ __func__, rb->idstr, start, length, ret);
goto err;
}
#else
ret = -ENOSYS;
- error_report("ram_block_discard_range: MADVISE not available"
- "%s:%" PRIx64 " +%zx (%d)",
- rb->idstr, start, length, ret);
+ error_report("%s: MADVISE not available %s:%" PRIx64 " +%zx (%d)",
+ __func__, rb->idstr, start, length, ret);
goto err;
#endif
}
trace_ram_block_discard_range(rb->idstr, host_startaddr, length,
need_madvise, need_fallocate, ret);
} else {
- error_report("ram_block_discard_range: Overrun block '%s' (%" PRIu64
- "/%zx/" RAM_ADDR_FMT")",
- rb->idstr, start, length, rb->max_length);
+ error_report("%s: Overrun block '%s' (%" PRIu64 "/%zx/"
RAM_ADDR_FMT")",
+ __func__, rb->idstr, start, length, rb->max_length);
}
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
