| Message ID | CA+XhMqzX=OaRgxQbHKU82K2WhTBwL44sr+wpGKSjZWqaehLyJQ@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] build: Haiku build fix | expand |
Hi! On 25/06/2020 23.30, David CARLIER wrote: > From 78706a28c6aa8b5e522b5781588b38961d79d6f6 Mon Sep 17 00:00:00 2001 > From: David Carlier <devnexen@gmail.com> > Date: Thu, 25 Jun 2020 19:32:42 +0000 > Subject: [PATCH] build: haiku system build fix The above header lines should not be part of the e-mail body (otherwise they will show up in the commit message if the patch gets applied with "git am"). > Most of missing features resides in the bsd library. > Also defining constant equivalence. > > Signed-off-by: David Carlier <devnexen@gmail.com> > --- > configure | 34 ++++++++++++++++++++++++++++++++-- > include/qemu/bswap.h | 2 ++ > include/qemu/osdep.h | 4 ++++ > os-posix.c | 4 ++++ > util/Makefile.objs | 2 +- > util/compatfd.c | 2 ++ > util/main-loop.c | 1 + > util/oslib-posix.c | 20 ++++++++++++++++++++ > util/qemu-openpty.c | 2 +- > 9 files changed, 67 insertions(+), 4 deletions(-) > > diff --git a/configure b/configure > index ba88fd1824..43baeadf31 100755 > --- a/configure > +++ b/configure > @@ -901,8 +901,8 @@ SunOS) > ;; > Haiku) > haiku="yes" > - QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS" > - LIBS="-lposix_error_mapper -lnetwork $LIBS" > + QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE $QEMU_CFLAGS" > + LIBS="-lposix_error_mapper -lnetwork -lbsd $LIBS" > ;; > Linux) > audio_drv_list="try-pa oss" > @@ -2373,6 +2373,30 @@ else > l2tpv3=no > fi > > +cat > $TMPC <<EOF > +#include <pty.h> > +int main(int argc, char *argv[]) { > + return 0; > +} > +EOF Please use the check_include function if you just want to test the availability of a header. > +if compile_prog "" "" ; then > + pty_h=yes > +else > + pty_h=no > +fi Thanks, Thomas
On Thu, 25 Jun 2020 at 22:31, David CARLIER <devnexen@gmail.com> wrote: > > From 78706a28c6aa8b5e522b5781588b38961d79d6f6 Mon Sep 17 00:00:00 2001 > From: David Carlier <devnexen@gmail.com> > Date: Thu, 25 Jun 2020 19:32:42 +0000 > Subject: [PATCH] build: haiku system build fix > > Most of missing features resides in the bsd library. > Also defining constant equivalence. > > Signed-off-by: David Carlier <devnexen@gmail.com> > --- > configure | 34 ++++++++++++++++++++++++++++++++-- > include/qemu/bswap.h | 2 ++ > include/qemu/osdep.h | 4 ++++ > os-posix.c | 4 ++++ > util/Makefile.objs | 2 +- > util/compatfd.c | 2 ++ > util/main-loop.c | 1 + > util/oslib-posix.c | 20 ++++++++++++++++++++ > util/qemu-openpty.c | 2 +- > 9 files changed, 67 insertions(+), 4 deletions(-) Would you mind splitting this into a patchset which has one patch for each fix, please? So a patch which makes configure probe for openpty-in-pty.h and use it, another patch for the mlockall change, another patch for haiku-implementation-of-qemu_init_exec_dir, and so on. We generally prefer each commit to do one thing; it's easier to review. thanks -- PMM
diff --git a/configure b/configure index ba88fd1824..43baeadf31 100755 --- a/configure +++ b/configure @@ -901,8 +901,8 @@ SunOS) ;; Haiku) haiku="yes" - QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS" - LIBS="-lposix_error_mapper -lnetwork $LIBS" + QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE $QEMU_CFLAGS" + LIBS="-lposix_error_mapper -lnetwork -lbsd $LIBS" ;; Linux) audio_drv_list="try-pa oss" @@ -2373,6 +2373,30 @@ else l2tpv3=no fi +cat > $TMPC <<EOF +#include <pty.h> +int main(int argc, char *argv[]) { + return 0; +} +EOF +if compile_prog "" "" ; then + pty_h=yes +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 @@ -7758,6 +7782,12 @@ fi if test "$sheepdog" = "yes" ; then echo "CONFIG_SHEEPDOG=y" >> $config_host_mak 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/include/qemu/bswap.h b/include/qemu/bswap.h index 2a9f3fe783..1d3e4c24e4 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -8,6 +8,8 @@ # include <machine/bswap.h> #elif defined(__FreeBSD__) # include <sys/endian.h> +#elif defined(__HAIKU__) +# include <endian.h> #elif defined(CONFIG_BYTESWAP_H) # include <byteswap.h> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index ff7c17b857..da970cf654 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -388,6 +388,10 @@ void qemu_anon_ram_free(void *ptr, size_t size); #define HAVE_CHARDEV_PARPORT 1 #endif +#if defined(__HAIKU__) +#define SIGIO SIGPOLL +#endif + #if defined(CONFIG_LINUX) #ifndef BUS_MCEERR_AR #define BUS_MCEERR_AR 4 diff --git a/os-posix.c b/os-posix.c index 3cd52e1e70..53c770d2cf 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 } diff --git a/util/Makefile.objs b/util/Makefile.objs index cc5e37177a..faebc13fac 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -39,7 +39,7 @@ util-obj-y += qsp.o util-obj-y += range.o util-obj-y += stats64.o util-obj-y += systemd.o -util-obj-$(CONFIG_POSIX) += drm.o +util-obj-$(CONFIG_LINUX) += drm.o util-obj-y += guest-random.o util-obj-$(CONFIG_GIO) += dbus.o dbus.o-cflags = $(GIO_CFLAGS) diff --git a/util/compatfd.c b/util/compatfd.c index c296f55d14..ee47dd8089 100644 --- a/util/compatfd.c +++ b/util/compatfd.c @@ -16,7 +16,9 @@ #include "qemu/osdep.h" #include "qemu/thread.h" +#if defined(CONFIG_SIGNALFD) #include <sys/syscall.h> +#endif struct sigfd_compat_info { diff --git a/util/main-loop.c b/util/main-loop.c index eda63fe4e0..43a4bd30c1 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -85,6 +85,7 @@ static int qemu_signal_init(Error **errp) * by sigwait() in the signal thread. Otherwise, the cpu thread will * not catch it reliably. */ + sigemptyset(&set); sigaddset(&set, SIG_IPI); sigaddset(&set, SIGIO); diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 39ddc77c85..fdb5907a31 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -38,7 +38,12 @@ #include "qemu/sockets.h" #include "qemu/thread.h" #include <libgen.h> +#if !defined(__HAIKU__) #include <sys/signal.h> +#else +#include <kernel/image.h> +#include <signal.h> +#endif #include "qemu/cutils.h" #ifdef CONFIG_LINUX @@ -390,6 +395,21 @@ void qemu_init_exec_dir(const char *argv0) } } } +#elif defined(__HAIKU__) + { + image_info ii; + int32_t c = 0; + + *buf = '\0'; + while (get_next_image_info(0, &c, &ii) == B_OK) { + if (ii.type == B_APP_IMAGE) { + strncpy(buf, ii.name, sizeof(buf)); + buf[sizeof(buf) - 1] = '\0'; + p = buf; + break; + } + } + } #endif /* If we don't have any way of figuring out the actual executable location then try argv[0]. */ diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c index 2e8b43bdf5..9d8ad6905e 100644 --- a/util/qemu-openpty.c +++ b/util/qemu-openpty.c @@ -35,7 +35,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#if defined(__GLIBC__) +#if defined CONFIG_PTY # include <pty.h> #elif defined CONFIG_BSD # include <termios.h>