[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/14] util: Fix broken build on Haiku
From: |
Thomas Huth |
Subject: |
[PULL 13/14] util: Fix broken build on Haiku |
Date: |
Tue, 19 Jul 2022 09:04:11 +0200 |
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
- [PULL 00/14] Testing and misc patches, (continued)
- [PULL 00/14] Testing and misc patches, Thomas Huth, 2022/07/19
- [PULL 01/14] qga: treat get-guest-fsinfo as "best effort", Thomas Huth, 2022/07/19
- [PULL 05/14] tests/vm: upgrade Ubuntu 18.04 VM to 20.04, Thomas Huth, 2022/07/19
- [PULL 08/14] tests/vm: add 1GB extra memory per core, Thomas Huth, 2022/07/19
- [PULL 02/14] tests/vm: use 'cp' instead of 'ln' for temporary vm images, Thomas Huth, 2022/07/19
- [PULL 07/14] tests/vm: remove duplicate 'centos' VM test, Thomas Huth, 2022/07/19
- [PULL 09/14] tests/vm: Remove docker cross-compile test from CentOS VM, Thomas Huth, 2022/07/19
- [PULL 11/14] tests/unit: Replace g_memdup() by g_memdup2(), Thomas Huth, 2022/07/19
- [PULL 04/14] tests/vm: switch centos.aarch64 to CentOS 8 Stream, Thomas Huth, 2022/07/19
- [PULL 10/14] qtest/machine-none: Add LoongArch support, Thomas Huth, 2022/07/19
- [PULL 13/14] util: Fix broken build on Haiku,
Thomas Huth <=
- [PULL 12/14] Replace 'whitelist' with 'allow', Thomas Huth, 2022/07/19
- [PULL 14/14] python/qemu/qmp/legacy: Replace 'returns-whitelist' with the correct type, Thomas Huth, 2022/07/19
- [PULL 03/14] tests/vm: switch CentOS 8 to CentOS 8 Stream, Thomas Huth, 2022/07/19
- [PULL 06/14] tests/vm: remove ubuntu.i386 VM test, Thomas Huth, 2022/07/19
- Re: [PULL 00/14] Testing and misc patches, Peter Maydell, 2022/07/19