[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/28] target/arm: correct return values for WRITE/RE
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 08/28] target/arm: correct return values for WRITE/READ in arm-semi |
Date: |
Tue, 28 May 2019 10:49:33 +0100 |
The documentation says the write should return the number of bytes not
written on an error (0 means everything was written). Read provides a
buffer length and the return value should be the buffer length - bytes
actually read. Remove the incorrect FIXME's and return the correct
values.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c
index 86e6ec48c2f..53e807ab721 100644
--- a/target/arm/arm-semi.c
+++ b/target/arm/arm-semi.c
@@ -331,13 +331,15 @@ target_ulong do_arm_semihosting(CPUARMState *env)
} else {
s = lock_user(VERIFY_READ, arg1, len, 1);
if (!s) {
- /* FIXME - should this error code be -TARGET_EFAULT ? */
- return (uint32_t)-1;
+ /* Return bytes not written on error */
+ return len;
}
ret = set_swi_errno(ts, write(arg0, s, len));
unlock_user(s, arg1, 0);
- if (ret == (uint32_t)-1)
- return -1;
+ if (ret == (uint32_t)-1) {
+ ret = 0;
+ }
+ /* Return bytes not written */
return len - ret;
}
case TARGET_SYS_READ:
@@ -352,15 +354,17 @@ target_ulong do_arm_semihosting(CPUARMState *env)
} else {
s = lock_user(VERIFY_WRITE, arg1, len, 0);
if (!s) {
- /* FIXME - should this error code be -TARGET_EFAULT ? */
- return (uint32_t)-1;
+ /* return bytes not read */
+ return len;
}
do {
ret = set_swi_errno(ts, read(arg0, s, len));
} while (ret == -1 && errno == EINTR);
unlock_user(s, arg1, len);
- if (ret == (uint32_t)-1)
- return -1;
+ if (ret == (uint32_t)-1) {
+ ret = 0;
+ }
+ /* Return bytes not read */
return len - ret;
}
case TARGET_SYS_READC:
--
2.20.1
- [Qemu-devel] [PULL 00/28] testing/next (system tests, docker, iotests), Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 05/28] target/arm: fixup some of the commentary for arm-semi, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 07/28] target/arm: add LOG_UNIMP messages to arm-semi, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 01/28] semihosting: move semihosting configuration into its own directory, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 02/28] semihosting: introduce CONFIG_SEMIHOSTING, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 08/28] target/arm: correct return values for WRITE/READ in arm-semi,
Alex Bennée <=
- [Qemu-devel] [PULL 04/28] semihosting: enable chardev backed output for console, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 03/28] semihosting: implement a semihosting console, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 10/28] target/mips: convert UHI_plog to use common semihosting code, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 09/28] target/mips: only build mips-semi for softmmu, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 11/28] MAINTAINERS: update for semihostings new home, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 06/28] target/arm: use the common interface for WRITE0/WRITEC in arm-semi, Alex Bennée, 2019/05/28
- [Qemu-devel] [PULL 12/28] tests/docker: add ubuntu 18.04, Alex Bennée, 2019/05/28