| Message ID | 20220612204851.19914-10-imp@bsdimp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bsd-user: Next round of syscalls | expand |
On 6/12/22 13:48, Warner Losh wrote: > Signed-off-by: Stacey Son <sson@FreeBSD.org> > Signed-off-by: Warner Losh <imp@bsdimp.com> > --- > bsd-user/bsd-file.h | 14 ++++++++++++++ > bsd-user/freebsd/os-syscall.c | 8 ++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h > index 500d6ba78b9..73263ba482f 100644 > --- a/bsd-user/bsd-file.h > +++ b/bsd-user/bsd-file.h > @@ -491,4 +491,18 @@ static abi_long do_bsd___getcwd(abi_long arg1, abi_long arg2) > return get_errno(ret); > } > > +/* dup(2) */ > +static abi_long do_bsd_dup(abi_long arg1) > +{ > + > + return get_errno(dup(arg1)); > +} > + > +/* dup2(2) */ > +static abi_long do_bsd_dup2(abi_long arg1, abi_long arg2) > +{ > + > + return get_errno(dup2(arg1, arg2)); > +} Extra lines. Is this some setting in your editor? Otherwise, Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
On Mon, Jun 13, 2022 at 1:53 PM Richard Henderson < richard.henderson@linaro.org> wrote: > On 6/12/22 13:48, Warner Losh wrote: > > Signed-off-by: Stacey Son <sson@FreeBSD.org> > > Signed-off-by: Warner Losh <imp@bsdimp.com> > > --- > > bsd-user/bsd-file.h | 14 ++++++++++++++ > > bsd-user/freebsd/os-syscall.c | 8 ++++++++ > > 2 files changed, 22 insertions(+) > > > > diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h > > index 500d6ba78b9..73263ba482f 100644 > > --- a/bsd-user/bsd-file.h > > +++ b/bsd-user/bsd-file.h > > @@ -491,4 +491,18 @@ static abi_long do_bsd___getcwd(abi_long arg1, > abi_long arg2) > > return get_errno(ret); > > } > > > > +/* dup(2) */ > > +static abi_long do_bsd_dup(abi_long arg1) > > +{ > > + > > + return get_errno(dup(arg1)); > > +} > > + > > +/* dup2(2) */ > > +static abi_long do_bsd_dup2(abi_long arg1, abi_long arg2) > > +{ > > + > > + return get_errno(dup2(arg1, arg2)); > > +} > > Extra lines. Is this some setting in your editor? Otherwise, > It's an odd quirk of FreeBSD's style from the 90s until 2020... I'm totally blind to it most of the time... > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > Thanks for this, and all the other reviews. Warner
diff --git a/bsd-user/bsd-file.h b/bsd-user/bsd-file.h index 500d6ba78b9..73263ba482f 100644 --- a/bsd-user/bsd-file.h +++ b/bsd-user/bsd-file.h @@ -491,4 +491,18 @@ static abi_long do_bsd___getcwd(abi_long arg1, abi_long arg2) return get_errno(ret); } +/* dup(2) */ +static abi_long do_bsd_dup(abi_long arg1) +{ + + return get_errno(dup(arg1)); +} + +/* dup2(2) */ +static abi_long do_bsd_dup2(abi_long arg1, abi_long arg2) +{ + + return get_errno(dup2(arg1, arg2)); +} + #endif /* BSD_FILE_H */ diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c index e28a566d6c3..d9ebb9d50d6 100644 --- a/bsd-user/freebsd/os-syscall.c +++ b/bsd-user/freebsd/os-syscall.c @@ -349,6 +349,14 @@ static abi_long freebsd_syscall(void *cpu_env, int num, abi_long arg1, ret = do_bsd___getcwd(arg1, arg2); break; + case TARGET_FREEBSD_NR_dup: /* dup(2) */ + ret = do_bsd_dup(arg1); + break; + + case TARGET_FREEBSD_NR_dup2: /* dup2(2) */ + ret = do_bsd_dup2(arg1, arg2); + break; + default: qemu_log_mask(LOG_UNIMP, "Unsupported syscall: %d\n", num); ret = -TARGET_ENOSYS;