mirror of
https://github.com/qemu/qemu.git
synced 2025-08-12 08:59:57 +00:00
linux-user: Remove duplicate CPU_LOG_PAGE from probe_guest_base
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>
This commit is contained in:
parent
3ce3dd8ca9
commit
435c042fdc
@ -2560,9 +2560,6 @@ static void pgb_have_guest_base(const char *image_name, abi_ulong guest_loaddr,
|
|||||||
if (test != addr) {
|
if (test != addr) {
|
||||||
pgb_fail_in_use(image_name);
|
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) {
|
if (mmap_start != MAP_FAILED) {
|
||||||
munmap(mmap_start, guest_size);
|
munmap(mmap_start, guest_size);
|
||||||
if (mmap_start == (void *) align_start) {
|
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;
|
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);
|
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;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2747,9 +2734,6 @@ static void pgb_static(const char *image_name, abi_ulong orig_loaddr,
|
|||||||
}
|
}
|
||||||
|
|
||||||
guest_base = addr;
|
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)
|
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));
|
reserved_va + 1, test, strerror(errno));
|
||||||
exit(EXIT_FAILURE);
|
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,
|
void probe_guest_base(const char *image_name, abi_ulong guest_loaddr,
|
||||||
|
Loading…
Reference in New Issue
Block a user