On Fri, Oct 8, 2021 at 6:15 PM Warner Losh <i...@bsdimp.com> wrote: > > Add the missing glue to pull in do_freebsd_sysarch to call > do_freebsd_arch_sysarch. Put it in os-sys.c, which will be used for > sysctl and sysarch system calls because they are mostly arch specific. > > Signed-off-by: Stacey Son <s...@freebsd.org> > Signed-off-by: Warner Losh <i...@bsdimp.com> > Reviewed-by: Richard Henderson <richard.hender...@linaro.org> > --- > bsd-user/freebsd/meson.build | 3 +++ > bsd-user/freebsd/os-sys.c | 27 +++++++++++++++++++++++++++ > bsd-user/meson.build | 3 +++ > bsd-user/qemu.h | 3 +++ > bsd-user/syscall.c | 7 ------- > 5 files changed, 36 insertions(+), 7 deletions(-) > create mode 100644 bsd-user/freebsd/meson.build > create mode 100644 bsd-user/freebsd/os-sys.c > > diff --git a/bsd-user/freebsd/meson.build b/bsd-user/freebsd/meson.build > new file mode 100644 > index 0000000000..4b69cca7b9 > --- /dev/null > +++ b/bsd-user/freebsd/meson.build > @@ -0,0 +1,3 @@ > +bsd_user_ss.add(files( > + 'os-sys.c', > +)) > diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c > new file mode 100644 > index 0000000000..309e27b9d6 > --- /dev/null > +++ b/bsd-user/freebsd/os-sys.c > @@ -0,0 +1,27 @@ > +/* > + * FreeBSD sysctl() and sysarch() system call emulation > + * > + * Copyright (c) 2013-15 Stacey D. Son > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include "qemu.h" > +#include "target_arch_sysarch.h" > + > +/* sysarch() is architecture dependent. */ > +abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2) > +{ > + return do_freebsd_arch_sysarch(cpu_env, arg1, arg2); > +} > diff --git a/bsd-user/meson.build b/bsd-user/meson.build > index 243fb78930..a4163c91ff 100644 > --- a/bsd-user/meson.build > +++ b/bsd-user/meson.build > @@ -12,3 +12,6 @@ bsd_user_ss.add(files( > 'syscall.c', > 'uaccess.c', > )) > + > +# Pull in the OS-specific build glue, if any > +subdir(targetos) > diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h > index cdb85140f4..e65e41d53d 100644 > --- a/bsd-user/qemu.h > +++ b/bsd-user/qemu.h > @@ -239,6 +239,9 @@ extern unsigned long target_sgrowsiz; > abi_long get_errno(abi_long ret); > bool is_error(abi_long ret); > > +/* os-sys.c */ > +abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2); > + > /* user access */ > > #define VERIFY_READ PAGE_READ > diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c > index d3b9f431e2..d3322760f4 100644 > --- a/bsd-user/syscall.c > +++ b/bsd-user/syscall.c > @@ -88,13 +88,6 @@ static abi_long do_obreak(abi_ulong new_brk) > return 0; > } > > -#if defined(TARGET_I386) > -static abi_long do_freebsd_sysarch(CPUX86State *env, int op, abi_ulong parms) > -{ > - do_freebsd_arch_sysarch(env, op, parms); > -} > -#endif > - > #ifdef __FreeBSD__ > /* > * XXX this uses the undocumented oidfmt interface to find the kind of > -- > 2.32.0 >
Reviewed-by: Kyle Evans <kev...@freebsd.org>