| Message ID | 20200703145614.16684-4-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Build fixes for Haiku | expand |
On 03/07/2020 16.56, Peter Maydell wrote: > From: David CARLIER <devnexen@gmail.com> > > Instead of assuming that all POSIX platforms provide mlockall(), > test for it in configure. If the host doesn't provide this platform > then os_mlock() will fail -ENOSYS, as it does already on Windows. > > This is necessary for Haiku, which does not have mlockall(). > > Signed-off-by: David Carlier <devnexen@gmail.com> > [PMM: Expanded commit message] > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > configure | 15 +++++++++++++++ > os-posix.c | 4 ++++ > 2 files changed, 19 insertions(+) [...] > diff --git a/os-posix.c b/os-posix.c > index 3cd52e1e700..e02b566940c 100644 > --- a/os-posix.c > +++ b/os-posix.c > @@ -337,6 +337,7 @@ bool is_daemonized(void) > > int os_mlock(void) > { > +#if defined CONFIG_MLOCKALL Also missing the parentheses? Thomas
diff --git a/configure b/configure index 5455ae10d05..ddc53d873ef 100755 --- a/configure +++ b/configure @@ -2392,6 +2392,18 @@ else pty_h=no fi +cat > $TMPC <<EOF +#include <sys/mman.h> +int main(int argc, char *argv[]) { + return mlockall(MCL_FUTURE); +} +EOF +if compile_prog "" "" ; then + have_mlockall=yes +else + have_mlockall=no +fi + ######################################### # vhost interdependencies and host support @@ -7865,6 +7877,9 @@ fi if test "$pty_h" = "yes" ; then echo "CONFIG_PTY=y" >> $config_host_mak fi +if test "$have_mlockall" = "yes" ; then + echo "CONFIG_MLOCKALL=y" >> $config_host_mak +fi if test "$fuzzing" = "yes" ; then if test "$have_fuzzer" = "yes"; then FUZZ_LDFLAGS=" -fsanitize=address,fuzzer" diff --git a/os-posix.c b/os-posix.c index 3cd52e1e700..e02b566940c 100644 --- a/os-posix.c +++ b/os-posix.c @@ -337,6 +337,7 @@ bool is_daemonized(void) int os_mlock(void) { +#if defined CONFIG_MLOCKALL int ret = 0; ret = mlockall(MCL_CURRENT | MCL_FUTURE); @@ -345,4 +346,7 @@ int os_mlock(void) } return ret; +#else + return -ENOSYS; +#endif }