All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 13/14] util: Fix broken build on Haiku
Date: Tue, 19 Jul 2022 09:04:11 +0200	[thread overview]
Message-ID: <20220719070412.16757-14-thuth@redhat.com> (raw)
In-Reply-To: <20220719070412.16757-1-thuth@redhat.com>

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")
Message-Id: <20220718172026.139004-1-thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
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



  parent reply	other threads:[~2022-07-19  7:18 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-19  7:03 [PULL 00/14] Testing and misc patches Thomas Huth
2022-07-19  7:03 ` [PULL 01/14] qga: treat get-guest-fsinfo as "best effort" Thomas Huth
2022-07-19  7:04 ` [PULL 02/14] tests/vm: use 'cp' instead of 'ln' for temporary vm images Thomas Huth
2022-07-19  7:04 ` [PULL 03/14] tests/vm: switch CentOS 8 to CentOS 8 Stream Thomas Huth
2022-07-19  7:04 ` [PULL 04/14] tests/vm: switch centos.aarch64 " Thomas Huth
2022-07-19  7:04 ` [PULL 05/14] tests/vm: upgrade Ubuntu 18.04 VM to 20.04 Thomas Huth
2022-07-19  7:04 ` [PULL 06/14] tests/vm: remove ubuntu.i386 VM test Thomas Huth
2022-07-19  7:04 ` [PULL 07/14] tests/vm: remove duplicate 'centos' " Thomas Huth
2022-07-19  7:04 ` [PULL 08/14] tests/vm: add 1GB extra memory per core Thomas Huth
2022-07-19  7:04 ` [PULL 09/14] tests/vm: Remove docker cross-compile test from CentOS VM Thomas Huth
2022-07-19  7:04 ` [PULL 10/14] qtest/machine-none: Add LoongArch support Thomas Huth
2022-07-19  7:04 ` [PULL 11/14] tests/unit: Replace g_memdup() by g_memdup2() Thomas Huth
2022-07-19  7:04 ` [PULL 12/14] Replace 'whitelist' with 'allow' Thomas Huth
2022-07-19  7:04 ` Thomas Huth [this message]
2022-07-19  7:04 ` [PULL 14/14] python/qemu/qmp/legacy: Replace 'returns-whitelist' with the correct type Thomas Huth
2022-07-19 16:14 ` [PULL 00/14] Testing and misc patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220719070412.16757-14-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.