semihosting: add O_BINARY flag in host_open for NT compatibility
PATCH 1/1 semihosting: add O_BINARY flag in host_open for NT compatibility
Windows open(2) implementations opens files in text mode by default and needs a Windows-only O_BINARY flag to open files as binary. Qemu already knows about that flag in osdep.h, so we can just add it to the host_flags for better compatibility when running qemu on Windows.
--- semihosting/syscalls.c | 2 ++ 1 file changed, 2 insertions(+)
semihosting/syscalls.c +2 -0
@@ -278,6 +278,8 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, host_flags |=O_EXCL ; } + host_flags |=O_BINARY ; + ret =open (p, host_flags, mode);if (ret <0 ) {complete (cs,-1 , errno);
Signature · 1 line
2.34.1
Quoted 2 lines · Evgeny Iakovlev
Windows open(2) implementations opens files in text mode by default and needs a Windows-only
O_BINARYflag to open files as binary. Qemu already
s/Qemu/QEMU/
Quoted 2 lines
knows about that flag in
osdep.h, so we can just add it to thehost_flagsfor better compatibility when running qemu on Windows.
s/qemu/QEMU/
Quoted 10 lines
Signed-off-by Evgeny Iakovlev <[email protected]>--- semihosting/syscalls.c | 2 ++ 1 file changed, 2 insertions(+)semihosting/syscalls.c +0
-0
semihosting/syscalls.c static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, · line 285
Quoted 8 lines
semihosting/syscalls.c +2
-0@@ -278,6 +278,8 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, host_flags |=O_EXCL ; } + host_flags |=O_BINARY ; + ret =open (p, host_flags, mode);if (ret <0 ) {complete (cs,-1 , errno);
Alternatively with more churn:
-- >8 --
semihosting/syscalls.c +4 -4
@@ -253,7 +253,7 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, { CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;char *p; -int ret, host_flags; +int ret, host_flags =O_BINARY ; ret =validate_lock_user_string (&p, cs, fname, fname_len);if (ret <0 ) {
@@ -262,11 +262,11 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, }if (gdb_flags &GDB_O_WRONLY ) { - host_flags =O_WRONLY ; + host_flags |=O_WRONLY ; }else if (gdb_flags &GDB_O_RDWR ) { - host_flags =O_RDWR ; + host_flags |=O_RDWR ; }else { - host_flags =O_RDONLY ; + host_flags |=O_RDONLY ; }if (gdb_flags &GDB_O_CREAT ) { host_flags |=O_CREAT ;
---
Bin Meng
Reviewed-byQuoted 64 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Evgeny Iakovlev
Windows open(2) implementations opens files in text mode by default and needs a Windows-only
O_BINARYflag to open files as binary. Qemu alreadys/Qemu/QEMU/
Quoted 2 lines
knows about that flag in
osdep.h, so we can just add it to thehost_flagsfor better compatibility when running qemu on Windows.s/qemu/QEMU/
Quoted 10 lines
Signed-off-by Evgeny Iakovlev <[email protected]>--- semihosting/syscalls.c | 2 ++ 1 file changed, 2 insertions(+)semihosting/syscalls.c +0
-0semihosting/syscalls.c static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, · line 285
Quoted 8 lines
semihosting/syscalls.c +2
-0@@ -278,6 +278,8 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, host_flags |=O_EXCL ; } + host_flags |=O_BINARY ; + ret =open (p, host_flags, mode);if (ret <0 ) {complete (cs,-1 , errno);Alternatively with more churn:
-- >8 --
semihosting/syscalls.c +1
-1@@ -253,7 +253,7 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, { CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;char *p; -int ret, host_flags; +int ret, host_flags =O_BINARY ; ret =validate_lock_user_string (&p, cs, fname, fname_len);if (ret < 0) {semihosting/syscalls.c +3
-3@@ -262,11 +262,11 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, }if (gdb_flags &GDB_O_WRONLY ) { - host_flags =O_WRONLY ; + host_flags |=O_WRONLY ; }else if (gdb_flags &GDB_O_RDWR ) { - host_flags =O_RDWR ; + host_flags |=O_RDWR ; }else { - host_flags =O_RDONLY ; + host_flags |=O_RDONLY ; }if (gdb_flags &GDB_O_CREAT ) {host_flags |= O_CREAT;
Quoted 4 lines
---
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
With Philippe's comments addressed,
Quoted 63 lines · Bin Meng
Quoted 62 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Evgeny Iakovlev
Windows open(2) implementations opens files in text mode by default and needs a Windows-only
O_BINARYflag to open files as binary. Qemu alreadys/Qemu/QEMU/
Quoted 2 lines
knows about that flag in
osdep.h, so we can just add it to thehost_flagsfor better compatibility when running qemu on Windows.s/qemu/QEMU/
Quoted 10 lines
Signed-off-by Evgeny Iakovlev <[email protected]>--- semihosting/syscalls.c | 2 ++ 1 file changed, 2 insertions(+)semihosting/syscalls.c +0
-0semihosting/syscalls.c static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, · line 285
Quoted 8 lines
semihosting/syscalls.c +2
-0@@ -278,6 +278,8 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, host_flags |=O_EXCL ; } + host_flags |=O_BINARY ; + ret =open (p, host_flags, mode);if (ret <0 ) {complete (cs,-1 , errno);Alternatively with more churn:
-- >8 --
semihosting/syscalls.c +1
-1@@ -253,7 +253,7 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, { CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;char *p; -int ret, host_flags; +int ret, host_flags =O_BINARY ; ret =validate_lock_user_string (&p, cs, fname, fname_len);if (ret < 0) {semihosting/syscalls.c +3
-3@@ -262,11 +262,11 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, }if (gdb_flags &GDB_O_WRONLY ) { - host_flags =O_WRONLY ; + host_flags |=O_WRONLY ; }else if (gdb_flags &GDB_O_RDWR ) { - host_flags =O_RDWR ; + host_flags |=O_RDWR ; }else { - host_flags =O_RDONLY ; + host_flags |=O_RDONLY ; }if (gdb_flags &GDB_O_CREAT ) {host_flags |= O_CREAT;---
Quoted 4 lines
Quoted 2 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>With Philippe's comments addressed,
Reviewed-by Bin Meng <[email protected]>
Done, sent out a v2, thanks!
Quoted 63 lines · Bin Meng
Quoted 62 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Evgeny Iakovlev
Windows open(2) implementations opens files in text mode by default and needs a Windows-only
O_BINARYflag to open files as binary. Qemu alreadys/Qemu/QEMU/
Quoted 2 lines
knows about that flag in
osdep.h, so we can just add it to thehost_flagsfor better compatibility when running qemu on Windows.s/qemu/QEMU/
Quoted 10 lines
Signed-off-by Evgeny Iakovlev <[email protected]>--- semihosting/syscalls.c | 2 ++ 1 file changed, 2 insertions(+)semihosting/syscalls.c +0
-0semihosting/syscalls.c static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, · line 285
Quoted 8 lines
semihosting/syscalls.c +2
-0@@ -278,6 +278,8 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, host_flags |=O_EXCL ; } + host_flags |=O_BINARY ; + ret =open (p, host_flags, mode);if (ret <0 ) {complete (cs,-1 , errno);Alternatively with more churn:
-- >8 --
semihosting/syscalls.c +1
-1@@ -253,7 +253,7 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, { CPUArchState *env G_GNUC_UNUSED = cs->env_ptr;char *p; -int ret, host_flags; +int ret, host_flags =O_BINARY ; ret =validate_lock_user_string (&p, cs, fname, fname_len);if (ret < 0) {semihosting/syscalls.c +3
-3@@ -262,11 +262,11 @@ static void host_open(CPUState *cs, gdb_syscall_complete_cb complete, }if (gdb_flags &GDB_O_WRONLY ) { - host_flags =O_WRONLY ; + host_flags |=O_WRONLY ; }else if (gdb_flags &GDB_O_RDWR ) { - host_flags =O_RDWR ; + host_flags |=O_RDWR ; }else { - host_flags =O_RDONLY ; + host_flags |=O_RDONLY ; }if (gdb_flags &GDB_O_CREAT ) {host_flags |= O_CREAT;---
Quoted 4 lines
Quoted 2 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>With Philippe's comments addressed,
Reviewed-by Bin Meng <[email protected]>
Done, sent out a v2, thanks!