* [PATCH 5/5] haiku build fix
@ 2020-06-26 10:07 David CARLIER
2020-06-26 11:13 ` Peter Maydell
2020-06-26 13:33 ` Thomas Huth
0 siblings, 2 replies; 6+ messages in thread
From: David CARLIER @ 2020-06-26 10:07 UTC (permalink / raw)
To: QEMU Trivial, qemu-devel
From 68d4d4312eccd212b4d2484e09425816ebd2346a Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Fri, 26 Jun 2020 11:01:54 +0000
Subject: [PATCH 5/5] Last chunk of build fix
Signed-off-by: David Carlier <devnexen@gmail.com>
---
include/qemu/bswap.h | 2 ++
util/Makefile.objs | 2 +-
util/compatfd.c | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
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/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
{
--
2.26.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 5/5] haiku build fix
2020-06-26 10:07 [PATCH 5/5] haiku build fix David CARLIER
@ 2020-06-26 11:13 ` Peter Maydell
2020-06-26 13:33 ` Thomas Huth
1 sibling, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2020-06-26 11:13 UTC (permalink / raw)
To: David CARLIER; +Cc: QEMU Trivial, qemu-devel
On Fri, 26 Jun 2020 at 11:10, David CARLIER <devnexen@gmail.com> wrote:
>
> From 68d4d4312eccd212b4d2484e09425816ebd2346a Mon Sep 17 00:00:00 2001
> From: David Carlier <devnexen@gmail.com>
> Date: Fri, 26 Jun 2020 11:01:54 +0000
> Subject: [PATCH 5/5] Last chunk of build fix
>
> Signed-off-by: David Carlier <devnexen@gmail.com>
> ---
> include/qemu/bswap.h | 2 ++
> util/Makefile.objs | 2 +-
> util/compatfd.c | 2 ++
> 3 files changed, 5 insertions(+), 1 deletion(-)
These changes are all good, but they're all fixing different
things, so they should be separate patches (with commit
messages describing what they're doing/why).
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 5/5] haiku build fix
2020-06-26 10:07 [PATCH 5/5] haiku build fix David CARLIER
2020-06-26 11:13 ` Peter Maydell
@ 2020-06-26 13:33 ` Thomas Huth
1 sibling, 0 replies; 6+ messages in thread
From: Thomas Huth @ 2020-06-26 13:33 UTC (permalink / raw)
To: David CARLIER, qemu-devel
On 26/06/2020 12.07, David CARLIER wrote:
> From 68d4d4312eccd212b4d2484e09425816ebd2346a Mon Sep 17 00:00:00 2001
> From: David Carlier <devnexen@gmail.com>
> Date: Fri, 26 Jun 2020 11:01:54 +0000
> Subject: [PATCH 5/5] Last chunk of build fix
>
> Signed-off-by: David Carlier <devnexen@gmail.com>
> ---
> include/qemu/bswap.h | 2 ++
> util/Makefile.objs | 2 +-
> util/compatfd.c | 2 ++
> 3 files changed, 5 insertions(+), 1 deletion(-)
Hi David,
not directly related to this patch, but: do you know whether Haiku can
also be installed non-interactively? We've got a set of VM-based
compilation tests for FreeBSD, NetBSD and OpenBSD, see tests/vm/ in the
QEMU sources (or run "make vm-help" for more information about the make
targets) ... if something similar would be possible for Haiku, that
would certainly help to prevent that the Haiku port bitrots so easily
again...
Thomas
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 5/5] haiku build fix
2020-06-26 12:54 [PATCH 5/5] haiku " David CARLIER
@ 2020-06-26 14:31 ` Eric Blake
0 siblings, 0 replies; 6+ messages in thread
From: Eric Blake @ 2020-06-26 14:31 UTC (permalink / raw)
To: David CARLIER, QEMU Trivial, qemu-devel
On 6/26/20 7:54 AM, David CARLIER wrote:
>>From 6fa7a4108236f513201192654e07c7044a3d7e58 Mon Sep 17 00:00:00 2001
> From: David Carlier <devnexen@gmail.com>
> Date: Fri, 26 Jun 2020 13:51:37 +0000
> Subject: [PATCH 3/3] qemu_init_exec_dir Haiku implementation
meta-comment: the original subject line says 5/5, while this line says
3/3, which adds to the confusion of which patches are actually doing
what, as well as which iteration of the patches we are on. Also, the
original subject line "haiku build fix" has been repeated for multiple
distinct emails; better is to have the subject line come from the patch
itself (the contents of this line would have been better as the overall
patch subject).
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 5/5] haiku build fix
@ 2020-06-26 12:54 David CARLIER
2020-06-26 14:31 ` Eric Blake
0 siblings, 1 reply; 6+ messages in thread
From: David CARLIER @ 2020-06-26 12:54 UTC (permalink / raw)
To: QEMU Trivial, qemu-devel
From 6fa7a4108236f513201192654e07c7044a3d7e58 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Fri, 26 Jun 2020 13:51:37 +0000
Subject: [PATCH 3/3] qemu_init_exec_dir Haiku implementation
Signed-off-by: David Carlier <devnexen@gmail.com>
---
util/oslib-posix.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 7ad9195c44..459e3f8093 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -60,6 +60,10 @@
#include <mach-o/dyld.h>
#endif
+#ifdef __HAIKU__
+#include <kernel/image.h>
+#endif
+
#include "qemu/mmap-alloc.h"
#ifdef CONFIG_DEBUG_STACK_USAGE
@@ -389,6 +393,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]. */
--
2.26.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] Haiku build fix
@ 2020-06-26 12:54 David CARLIER
0 siblings, 0 replies; 6+ messages in thread
From: David CARLIER @ 2020-06-26 12:54 UTC (permalink / raw)
To: QEMU Trivial, qemu-devel
From d36aba6190152c626f668fef3704ee6b61bfc323 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@gmail.com>
Date: Fri, 26 Jun 2020 13:45:04 +0000
Subject: [PATCH 2/3] define SIGIO for haiku
Signed-off-by: David Carlier <devnexen@gmail.com>
---
include/qemu/osdep.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index f88fe23936..860bb3c16c 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
--
2.26.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-06-26 14:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-26 10:07 [PATCH 5/5] haiku build fix David CARLIER
2020-06-26 11:13 ` Peter Maydell
2020-06-26 13:33 ` Thomas Huth
2020-06-26 12:54 [PATCH 5/5] Haiku " David CARLIER
2020-06-26 12:54 [PATCH 5/5] haiku " David CARLIER
2020-06-26 14:31 ` Eric Blake
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.