* [PATCH] util: Fix broken build on Haiku
@ 2022-07-18 17:20 Thomas Huth
2022-07-18 17:26 ` Marc-André Lureau
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Thomas Huth @ 2022-07-18 17:20 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Marc-André Lureau, John Snow,
Alexander von Gluck IV
A recent commit moved some Haiku-specific code parts from oslib-posix.c
to cutils.c, but failed to move the corresponding header #include
statement, too, so "make vm-build-haiku.x86_64" is currently broken.
Fix it by moving the header #include, too.
Fixes: 06680b15b4 ("include: move qemu_*_exec_dir() to cutils")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
util/cutils.c | 4 ++++
util/oslib-posix.c | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/cutils.c b/util/cutils.c
index 8199dac598..cb43dda213 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -35,6 +35,10 @@
#include <sys/sysctl.h>
#endif
+#ifdef __HAIKU__
+#include <kernel/image.h>
+#endif
+
#ifdef G_OS_WIN32
#include <pathcch.h>
#include <wchar.h>
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 7a34c1657c..bffec18869 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -62,10 +62,6 @@
#include <mach-o/dyld.h>
#endif
-#ifdef __HAIKU__
-#include <kernel/image.h>
-#endif
-
#include "qemu/mmap-alloc.h"
#ifdef CONFIG_DEBUG_STACK_USAGE
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] util: Fix broken build on Haiku
2022-07-18 17:20 [PATCH] util: Fix broken build on Haiku Thomas Huth
@ 2022-07-18 17:26 ` Marc-André Lureau
2022-07-18 23:55 ` John Snow
2022-07-19 9:33 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Marc-André Lureau @ 2022-07-18 17:26 UTC (permalink / raw)
To: Thomas Huth; +Cc: QEMU, Paolo Bonzini, John Snow, Alexander von Gluck IV
[-- Attachment #1: Type: text/plain, Size: 1392 bytes --]
On Mon, Jul 18, 2022 at 9:22 PM Thomas Huth <thuth@redhat.com> wrote:
> A recent commit moved some Haiku-specific code parts from oslib-posix.c
> to cutils.c, but failed to move the corresponding header #include
> statement, too, so "make vm-build-haiku.x86_64" is currently broken.
> Fix it by moving the header #include, too.
>
> Fixes: 06680b15b4 ("include: move qemu_*_exec_dir() to cutils")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> util/cutils.c | 4 ++++
> util/oslib-posix.c | 4 ----
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/util/cutils.c b/util/cutils.c
> index 8199dac598..cb43dda213 100644
> --- a/util/cutils.c
> +++ b/util/cutils.c
> @@ -35,6 +35,10 @@
> #include <sys/sysctl.h>
> #endif
>
> +#ifdef __HAIKU__
> +#include <kernel/image.h>
> +#endif
> +
> #ifdef G_OS_WIN32
> #include <pathcch.h>
> #include <wchar.h>
> diff --git a/util/oslib-posix.c b/util/oslib-posix.c
> index 7a34c1657c..bffec18869 100644
> --- a/util/oslib-posix.c
> +++ b/util/oslib-posix.c
> @@ -62,10 +62,6 @@
> #include <mach-o/dyld.h>
> #endif
>
> -#ifdef __HAIKU__
> -#include <kernel/image.h>
> -#endif
> -
> #include "qemu/mmap-alloc.h"
>
> #ifdef CONFIG_DEBUG_STACK_USAGE
> --
> 2.31.1
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 2219 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] util: Fix broken build on Haiku
2022-07-18 17:20 [PATCH] util: Fix broken build on Haiku Thomas Huth
2022-07-18 17:26 ` Marc-André Lureau
@ 2022-07-18 23:55 ` John Snow
2022-07-19 9:33 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: John Snow @ 2022-07-18 23:55 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Paolo Bonzini, Marc-André Lureau,
Alexander von Gluck IV
On Mon, Jul 18, 2022 at 1:20 PM Thomas Huth <thuth@redhat.com> wrote:
>
> A recent commit moved some Haiku-specific code parts from oslib-posix.c
> to cutils.c, but failed to move the corresponding header #include
> statement, too, so "make vm-build-haiku.x86_64" is currently broken.
> Fix it by moving the header #include, too.
>
> Fixes: 06680b15b4 ("include: move qemu_*_exec_dir() to cutils")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Thanks for this one !!
--js
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] util: Fix broken build on Haiku
2022-07-18 17:20 [PATCH] util: Fix broken build on Haiku Thomas Huth
2022-07-18 17:26 ` Marc-André Lureau
2022-07-18 23:55 ` John Snow
@ 2022-07-19 9:33 ` Paolo Bonzini
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2022-07-19 9:33 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Marc-André Lureau, John Snow,
Alexander von Gluck IV
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-19 9:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-18 17:20 [PATCH] util: Fix broken build on Haiku Thomas Huth
2022-07-18 17:26 ` Marc-André Lureau
2022-07-18 23:55 ` John Snow
2022-07-19 9:33 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).