| Message ID | 20230421165351.3177-2-kariem.taha2.7@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Contribution task implementations, for the 'FreeBSD user emulation improvements' project. | expand |
You've not fully addressed the feedback on v3. The first line of the commit message needs to be a short sumary, not the Signed-off-by, which should be at the end of the commit message On Fri, Apr 21, 2023 at 06:53:41PM +0200, Karim Taha wrote: > From: Warner Losh <imp@bsdimp.com> > > Intialize guest_base in bsd-user/main.c. > > Allow guest_base to be initialized on 64-bit hosts, the initial value is used by g2h_untagged function defined in include/exec/cpu_ldst.h You also need to put line breaks in the commit message to keep it at around 72 chars > > Signed-off-by: Warner Losh <imp@bsdimp.com> > Signed-off-by: Karim Taha <kariem.taha2.7@gmail.com> > --- > bsd-user/main.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/bsd-user/main.c b/bsd-user/main.c > index babc3b009b..afdc1b5f3c 100644 > --- a/bsd-user/main.c > +++ b/bsd-user/main.c > @@ -50,8 +50,22 @@ > #include "target_arch_cpu.h" > > int singlestep; > -uintptr_t guest_base; > + > +/* > + * Going hand in hand with the va space needed (see below), we need > + * to find a host address to map the guest to. Assume that qemu > + * itself doesn't need memory above 32GB (or that we don't collide > + * with anything interesting). This is selected rather arbitrarily, > + * but seems to produce good results in tests to date. > + */ > +# if HOST_LONG_BITS >= 64 > +uintptr_t guest_base = 0x800000000ul; /* at 32GB */ > +bool have_guest_base = true; > +#else > +uintptr_t guest_base; /* TODO: use sysctl to find big enough hole */ > bool have_guest_base; > +#endif > + > /* > * When running 32-on-64 we should make sure we can fit all of the possible > * guest address space into a contiguous chunk of virtual host memory. > -- > 2.40.0 > > With regards, Daniel
diff --git a/bsd-user/main.c b/bsd-user/main.c index babc3b009b..afdc1b5f3c 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -50,8 +50,22 @@ #include "target_arch_cpu.h" int singlestep; -uintptr_t guest_base; + +/* + * Going hand in hand with the va space needed (see below), we need + * to find a host address to map the guest to. Assume that qemu + * itself doesn't need memory above 32GB (or that we don't collide + * with anything interesting). This is selected rather arbitrarily, + * but seems to produce good results in tests to date. + */ +# if HOST_LONG_BITS >= 64 +uintptr_t guest_base = 0x800000000ul; /* at 32GB */ +bool have_guest_base = true; +#else +uintptr_t guest_base; /* TODO: use sysctl to find big enough hole */ bool have_guest_base; +#endif + /* * When running 32-on-64 we should make sure we can fit all of the possible * guest address space into a contiguous chunk of virtual host memory.