aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-05-16 19:37:14 -0700
committerRichard Henderson <richard.henderson@linaro.org>2022-06-28 04:35:07 +0530
commit4cfeff4ac16bf5e3e1df44d5561b83e3bd3aab6c (patch)
treecf4e91a234fd9bfe57f91b70761d36f9d278cc7e
parent84ca0dfd1e8c0a23fe8aeb22f4141e0b14da2812 (diff)
downloadqemu-4cfeff4ac16bf5e3e1df44d5561b83e3bd3aab6c.zip
qemu-4cfeff4ac16bf5e3e1df44d5561b83e3bd3aab6c.tar.gz
qemu-4cfeff4ac16bf5e3e1df44d5561b83e3bd3aab6c.tar.bz2
semihosting: Clean up common_semi_open_cb
Use common_semi_cb to return results instead of calling set_swi_errno and common_semi_set_ret directly. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-rw-r--r--semihosting/arm-compat-semi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index cc13fcb..6414caa 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -364,15 +364,13 @@ static int common_semi_open_guestfd;
static void
common_semi_open_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
- if (ret == (target_ulong)-1) {
- errno = err;
- set_swi_errno(cs, -1);
+ if (err) {
dealloc_guestfd(common_semi_open_guestfd);
} else {
associate_guestfd(common_semi_open_guestfd, ret);
ret = common_semi_open_guestfd;
}
- common_semi_set_ret(cs, ret);
+ common_semi_cb(cs, ret, err);
}
static target_ulong