On 1/2/24 05:57, Richard Henderson wrote:
> We cannot skip over the_end1 to the_end, because we fail to
> record the validity of the guest page with the interval tree.
> Remove "the_end" and rename "the_end1" to "the_end".
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> linux-user/mmap.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/linux-user/mmap.c b/linux-user/mmap.c
> index fbaea832c5..48fcdd4a32 100644
> --- a/linux-user/mmap.c
> +++ b/linux-user/mmap.c
> @@ -643,7 +643,7 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len,
> target_prot, flags, fd, offset)) {
> return -1;
> }
> - goto the_end1;
> + goto the_end;
> }
> if (!mmap_frag(real_start, start,
> real_start + host_page_size - 1,
> @@ -690,7 +690,7 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len,
> passthrough_last = real_last;
> }
> }
> - the_end1:
> + the_end:
> if (flags & MAP_ANONYMOUS) {
> page_flags |= PAGE_ANON;
> }
> @@ -708,7 +708,6 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len,
> }
> }
> shm_region_rm_complete(start, last);
> - the_end:
> trace_target_mmap_complete(start);
> if (qemu_loglevel_mask(CPU_LOG_PAGE)) {
> FILE *f = qemu_log_trylock();
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>