[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/60] semihosting: Clean up common_semi_flen_cb
From: |
Richard Henderson |
Subject: |
[PULL 11/60] semihosting: Clean up common_semi_flen_cb |
Date: |
Tue, 28 Jun 2022 10:23:14 +0530 |
Do not read from the gdb struct stat buffer if the callback is
reporting an error. Use common_semi_cb to finish returning results.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
semihosting/arm-compat-semi.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 88d6bdeaf2..cc13fcb0ef 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -346,15 +346,17 @@ static target_ulong common_semi_flen_buf(CPUState *cs)
static void
common_semi_flen_cb(CPUState *cs, target_ulong ret, target_ulong err)
{
- /* The size is always stored in big-endian order, extract
- the value. We assume the size always fit in 32 bits. */
- uint32_t size;
- cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) + 32,
- (uint8_t *)&size, 4, 0);
- size = be32_to_cpu(size);
- common_semi_set_ret(cs, size);
- errno = err;
- set_swi_errno(cs, -1);
+ if (!err) {
+ /*
+ * The size is always stored in big-endian order, extract
+ * the value. We assume the size always fit in 32 bits.
+ */
+ uint32_t size;
+ cpu_memory_rw_debug(cs, common_semi_flen_buf(cs) + 32,
+ (uint8_t *)&size, 4, 0);
+ ret = be32_to_cpu(size);
+ }
+ common_semi_cb(cs, ret, err);
}
static int common_semi_open_guestfd;
--
2.34.1
- [PULL 01/60] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h, (continued)
- [PULL 01/60] semihosting: Move exec/softmmu-semi.h to semihosting/softmmu-uaccess.h, Richard Henderson, 2022/06/28
- [PULL 02/60] semihosting: Return failure from softmmu-uaccess.h functions, Richard Henderson, 2022/06/28
- [PULL 04/60] semihosting: Move softmmu-uaccess.h functions out of line, Richard Henderson, 2022/06/28
- [PULL 05/60] accel/stubs: Add tcg stub for probe_access_flags, Richard Henderson, 2022/06/28
- [PULL 03/60] semihosting: Improve condition for config.c and console.c, Richard Henderson, 2022/06/28
- [PULL 06/60] semihosting: Add target_strlen for softmmu-uaccess.h, Richard Henderson, 2022/06/28
- [PULL 07/60] semihosting: Simplify softmmu_lock_user_string, Richard Henderson, 2022/06/28
- [PULL 08/60] semihosting: Split out guestfd.c, Richard Henderson, 2022/06/28
- [PULL 09/60] semihosting: Inline set_swi_errno into common_semi_cb, Richard Henderson, 2022/06/28
- [PULL 10/60] semihosting: Adjust error checking in common_semi_cb, Richard Henderson, 2022/06/28
- [PULL 11/60] semihosting: Clean up common_semi_flen_cb,
Richard Henderson <=
- [PULL 12/60] semihosting: Clean up common_semi_open_cb, Richard Henderson, 2022/06/28
- [PULL 13/60] semihosting: Return void from do_common_semihosting, Richard Henderson, 2022/06/28
- [PULL 14/60] semihosting: Move common-semi.h to include/semihosting/, Richard Henderson, 2022/06/28
- [PULL 15/60] semihosting: Remove GDB_O_BINARY, Richard Henderson, 2022/06/28
- [PULL 16/60] include/exec: Move gdb open flags to gdbstub.h, Richard Henderson, 2022/06/28
- [PULL 17/60] include/exec: Move gdb_stat and gdb_timeval to gdbstub.h, Richard Henderson, 2022/06/28
- [PULL 19/60] gdbstub: Convert GDB error numbers to host error numbers, Richard Henderson, 2022/06/28
- [PULL 22/60] semihosting: Split common_semi_flen_buf per target, Richard Henderson, 2022/06/28
- [PULL 18/60] include/exec: Define errno values in gdbstub.h, Richard Henderson, 2022/06/28
- [PULL 20/60] semihosting: Use struct gdb_stat in common_semi_flen_cb, Richard Henderson, 2022/06/28