| Message ID | 20230924210136.11966-7-kariem.taha2.7@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | bsd-user: Implement freebsd process related system calls. | expand |
On Sun, Sep 24, 2023 at 8:36 PM Karim Taha <kariem.taha2.7@gmail.com> wrote: > From: Stacey Son <sson@FreeBSD.org> > > Signed-off-by: Stacey Son <sson@FreeBSD.org> > Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com> > --- > bsd-user/bsd-proc.c | 40 ++++++++++++++++++++++++++++++++++++++++ > bsd-user/bsd-proc.h | 4 ++++ > bsd-user/meson.build | 6 ++++++ > 3 files changed, 50 insertions(+) > create mode 100644 bsd-user/bsd-proc.c > This looks good. The extra libraries relative to linux-user are for the stuff bsd-user does to support some additional things than linux-user supports. Reviewed-by: Warner Losh <imp@bsdimp.com> > diff --git a/bsd-user/bsd-proc.c b/bsd-user/bsd-proc.c > new file mode 100644 > index 0000000000..68410a0aa9 > --- /dev/null > +++ b/bsd-user/bsd-proc.c > @@ -0,0 +1,40 @@ > +/* > + * BSD process related system call helpers > + * > + * Copyright (c) 2013-14 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/osdep.h" > + > +#include <sys/param.h> > +#include <sys/types.h> > +#include <sys/cpuset.h> > +#include <sys/resource.h> > +#include <sys/wait.h> > + > +#include "qemu.h" > +#include "qemu-bsd.h" > +#include "signal-common.h" > + > +#include "bsd-proc.h" > + > +/* > + * resource/rusage conversion > + */ > +int target_to_host_resource(int code) > +{ > + return code; > +} > + > diff --git a/bsd-user/bsd-proc.h b/bsd-user/bsd-proc.h > index a1061bffb8..048773a75d 100644 > --- a/bsd-user/bsd-proc.h > +++ b/bsd-user/bsd-proc.h > @@ -22,6 +22,10 @@ > > #include <sys/resource.h> > > +#include "qemu-bsd.h" > +#include "gdbstub/syscalls.h" > +#include "qemu/plugin.h" > + > /* exit(2) */ > static inline abi_long do_bsd_exit(void *cpu_env, abi_long arg1) > { > diff --git a/bsd-user/meson.build b/bsd-user/meson.build > index 5243122fc5..b97fce1472 100644 > --- a/bsd-user/meson.build > +++ b/bsd-user/meson.build > @@ -7,6 +7,7 @@ bsd_user_ss = ss.source_set() > common_user_inc += include_directories('include') > > bsd_user_ss.add(files( > + 'bsd-proc.c', > 'bsdload.c', > 'elfload.c', > 'main.c', > @@ -16,6 +17,11 @@ bsd_user_ss.add(files( > 'uaccess.c', > )) > > +elf = cc.find_library('elf', required: true) > +procstat = cc.find_library('procstat', required: true) > +kvm = cc.find_library('kvm', required: true) > +bsd_user_ss.add(elf, procstat, kvm) > + > # Pull in the OS-specific build glue, if any > subdir(targetos) > > -- > 2.42.0 > >
diff --git a/bsd-user/bsd-proc.c b/bsd-user/bsd-proc.c new file mode 100644 index 0000000000..68410a0aa9 --- /dev/null +++ b/bsd-user/bsd-proc.c @@ -0,0 +1,40 @@ +/* + * BSD process related system call helpers + * + * Copyright (c) 2013-14 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/osdep.h" + +#include <sys/param.h> +#include <sys/types.h> +#include <sys/cpuset.h> +#include <sys/resource.h> +#include <sys/wait.h> + +#include "qemu.h" +#include "qemu-bsd.h" +#include "signal-common.h" + +#include "bsd-proc.h" + +/* + * resource/rusage conversion + */ +int target_to_host_resource(int code) +{ + return code; +} + diff --git a/bsd-user/bsd-proc.h b/bsd-user/bsd-proc.h index a1061bffb8..048773a75d 100644 --- a/bsd-user/bsd-proc.h +++ b/bsd-user/bsd-proc.h @@ -22,6 +22,10 @@ #include <sys/resource.h> +#include "qemu-bsd.h" +#include "gdbstub/syscalls.h" +#include "qemu/plugin.h" + /* exit(2) */ static inline abi_long do_bsd_exit(void *cpu_env, abi_long arg1) { diff --git a/bsd-user/meson.build b/bsd-user/meson.build index 5243122fc5..b97fce1472 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -7,6 +7,7 @@ bsd_user_ss = ss.source_set() common_user_inc += include_directories('include') bsd_user_ss.add(files( + 'bsd-proc.c', 'bsdload.c', 'elfload.c', 'main.c', @@ -16,6 +17,11 @@ bsd_user_ss.add(files( 'uaccess.c', )) +elf = cc.find_library('elf', required: true) +procstat = cc.find_library('procstat', required: true) +kvm = cc.find_library('kvm', required: true) +bsd_user_ss.add(elf, procstat, kvm) + # Pull in the OS-specific build glue, if any subdir(targetos)