From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Samuel Tardieu <sam@rfc1149.net>,
Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL v2 2/8] tcg: Make the cleanup-on-error path unique
Date: Tue, 23 Jan 2024 20:24:06 +1000 [thread overview]
Message-ID: <20240123102412.4569-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240123102412.4569-1-richard.henderson@linaro.org>
From: Samuel Tardieu <sam@rfc1149.net>
By calling `error_setg_errno()` before jumping to the cleanup-on-error
path at the `fail` label, the cleanup path is clearer.
Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20231219182212.455952-3-sam@rfc1149.net>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/region.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tcg/region.c b/tcg/region.c
index 467e51cf6f..478ec051c4 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -584,7 +584,9 @@ static int alloc_code_gen_buffer_splitwx_memfd(size_t size, Error **errp)
buf_rx = mmap(NULL, size, host_prot_read_exec(), MAP_SHARED, fd, 0);
if (buf_rx == MAP_FAILED) {
- goto fail_rx;
+ error_setg_errno(errp, errno,
+ "failed to map shared memory for execute");
+ goto fail;
}
close(fd);
@@ -594,8 +596,6 @@ static int alloc_code_gen_buffer_splitwx_memfd(size_t size, Error **errp)
return PROT_READ | PROT_WRITE;
- fail_rx:
- error_setg_errno(errp, errno, "failed to map shared memory for execute");
fail:
/* buf_rx is always equal to MAP_FAILED here and does not require cleanup */
if (buf_rw) {
--
2.34.1
next prev parent reply other threads:[~2024-01-23 10:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-23 10:24 [PULL v2 0/8] tcg pach queue Richard Henderson
2024-01-23 10:24 ` [PULL v2 1/8] tcg: Remove unreachable code Richard Henderson
2024-01-23 10:24 ` Richard Henderson [this message]
2024-01-23 10:24 ` [PULL v2 3/8] linux-user: Fixed cpu restore with pc 0 on SIGBUS Richard Henderson
2024-01-23 10:24 ` [PULL v2 4/8] tcg/s390x: Fix encoding of VRIc, VRSa, VRSc insns Richard Henderson
2024-01-23 10:24 ` [PULL v2 5/8] linux-user/riscv: Adjust vdso signal frame cfa offsets Richard Henderson
2024-01-23 10:24 ` [PULL v2 6/8] linux-user/elfload: test return value of getrlimit Richard Henderson
2024-01-23 10:24 ` [PULL v2 7/8] linux-user/elfload: check PR_GET_DUMPABLE before creating coredump Richard Henderson
2024-01-23 10:24 ` [PULL v2 8/8] tcg/arm: Fix SIGILL in tcg_out_qemu_st_direct Richard Henderson
2024-01-25 15:11 ` [PULL v2 0/8] tcg pach queue Peter Maydell
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=20240123102412.4569-3-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=sam@rfc1149.net \
/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).