| Message ID | 20220201111455.52511-9-imp@bsdimp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bsd-user: Start upstreaming the system calls. | expand |
On Tue, Feb 1, 2022 at 5:14 AM Warner Losh <imp@bsdimp.com> wrote: > > Remove keeping track of which type of bsd we're running on. It's no > longer referenced in the code. Building bsd-user on NetBSD or OpenBSD > isn't possible, let alone running that code. Stop pretending that we can > do the cross BSD thing since there's been a large divergence since 2000 > that makes this nearly impossible between FreeBSD and {Net,Open}BSD and > at least quite difficult between NetBSD and OpenBSD. > > Signed-off-by: Warner Losh <imp@bsdimp.com> > --- > bsd-user/main.c | 2 -- > bsd-user/qemu.h | 7 ------- > 2 files changed, 9 deletions(-) > Reviewed-by: Kyle Evans <kevans@FreeBSD.org> > diff --git a/bsd-user/main.c b/bsd-user/main.c > index bddb830e99b..88d347d05eb 100644 > --- a/bsd-user/main.c > +++ b/bsd-user/main.c > @@ -96,7 +96,6 @@ unsigned long reserved_va; > > static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; > const char *qemu_uname_release; > -enum BSDType bsd_type; > char qemu_proc_pathname[PATH_MAX]; /* full path to exeutable */ > > unsigned long target_maxtsiz = TARGET_MAXTSIZ; /* max text size */ > @@ -284,7 +283,6 @@ int main(int argc, char **argv) > const char *gdbstub = NULL; > char **target_environ, **wrk; > envlist_t *envlist = NULL; > - bsd_type = HOST_DEFAULT_BSD_TYPE; > char *argv0 = NULL; > > adjust_ssize(); > diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h > index 02921ac8b3b..e5742bd6c03 100644 > --- a/bsd-user/qemu.h > +++ b/bsd-user/qemu.h > @@ -29,13 +29,6 @@ > > extern char **environ; > > -enum BSDType { > - target_freebsd, > - target_netbsd, > - target_openbsd, > -}; > -extern enum BSDType bsd_type; > - > #include "exec/user/thunk.h" > #include "target_arch.h" > #include "syscall_defs.h" > -- > 2.33.1 >
On 2/1/22 22:14, Warner Losh wrote: > Remove keeping track of which type of bsd we're running on. It's no > longer referenced in the code. Building bsd-user on NetBSD or OpenBSD > isn't possible, let alone running that code. Stop pretending that we can > do the cross BSD thing since there's been a large divergence since 2000 > that makes this nearly impossible between FreeBSD and {Net,Open}BSD and > at least quite difficult between NetBSD and OpenBSD. > > Signed-off-by: Warner Losh<imp@bsdimp.com> > --- > bsd-user/main.c | 2 -- > bsd-user/qemu.h | 7 ------- > 2 files changed, 9 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/bsd-user/main.c b/bsd-user/main.c index bddb830e99b..88d347d05eb 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -96,7 +96,6 @@ unsigned long reserved_va; static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX; const char *qemu_uname_release; -enum BSDType bsd_type; char qemu_proc_pathname[PATH_MAX]; /* full path to exeutable */ unsigned long target_maxtsiz = TARGET_MAXTSIZ; /* max text size */ @@ -284,7 +283,6 @@ int main(int argc, char **argv) const char *gdbstub = NULL; char **target_environ, **wrk; envlist_t *envlist = NULL; - bsd_type = HOST_DEFAULT_BSD_TYPE; char *argv0 = NULL; adjust_ssize(); diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 02921ac8b3b..e5742bd6c03 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -29,13 +29,6 @@ extern char **environ; -enum BSDType { - target_freebsd, - target_netbsd, - target_openbsd, -}; -extern enum BSDType bsd_type; - #include "exec/user/thunk.h" #include "target_arch.h" #include "syscall_defs.h"
Remove keeping track of which type of bsd we're running on. It's no longer referenced in the code. Building bsd-user on NetBSD or OpenBSD isn't possible, let alone running that code. Stop pretending that we can do the cross BSD thing since there's been a large divergence since 2000 that makes this nearly impossible between FreeBSD and {Net,Open}BSD and at least quite difficult between NetBSD and OpenBSD. Signed-off-by: Warner Losh <imp@bsdimp.com> --- bsd-user/main.c | 2 -- bsd-user/qemu.h | 7 ------- 2 files changed, 9 deletions(-)