diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-04-16 14:55:40 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-04-17 18:44:30 +0100 |
| commit | ec63ca2d356f7be018138d7f66b13dffd2396b9f (patch) | |
| tree | 95625c46e94c4d2676d1cad5ebcffe4b44458b19 /include | |
| parent | 875df03b221ef6a67f175f1f283ea5598f717da5 (diff) | |
| download | qemu-ec63ca2d356f7be018138d7f66b13dffd2396b9f.zip qemu-ec63ca2d356f7be018138d7f66b13dffd2396b9f.tar.gz qemu-ec63ca2d356f7be018138d7f66b13dffd2396b9f.tar.bz2 | |
include/qemu/osdep.h: Move system includes to top
Mostly osdep.h puts the system includes at the top of the file; but
there are a couple of exceptions where we include a system header
halfway through the file. Move these up to the top with the rest
so that all the system headers we include are included before
we include os-win32.h or os-posix.h.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210416135543.20382-4-peter.maydell@linaro.org
Message-id: 20210414184343.26235-1-peter.maydell@linaro.org
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/osdep.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 6d8562e..cb2a07e 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -104,6 +104,15 @@ QEMU_EXTERN_C int daemon(int, int); #include <setjmp.h> #include <signal.h> +#ifdef CONFIG_IOVEC +#include <sys/uio.h> +#endif + +#if defined(__linux__) && defined(__sparc__) +/* The SPARC definition of QEMU_VMALLOC_ALIGN needs SHMLBA */ +#include <sys/shm.h> +#endif + #ifndef _WIN32 #include <sys/wait.h> #else @@ -111,6 +120,10 @@ QEMU_EXTERN_C int daemon(int, int); #define WEXITSTATUS(x) (x) #endif +#ifdef __APPLE__ +#include <AvailabilityMacros.h> +#endif + /* * This is somewhat like a system header; it must be outside any extern "C" * block because it includes system headers itself, including glib.h, @@ -130,10 +143,6 @@ extern "C" { #include "sysemu/os-posix.h" #endif -#ifdef __APPLE__ -#include <AvailabilityMacros.h> -#endif - #include "qemu/typedefs.h" /* @@ -469,7 +478,6 @@ void qemu_anon_ram_free(void *ptr, size_t size); /* Use 1 MiB (segment size) alignment so gmap can be used by KVM. */ # define QEMU_VMALLOC_ALIGN (256 * 4096) #elif defined(__linux__) && defined(__sparc__) -#include <sys/shm.h> # define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA) #else # define QEMU_VMALLOC_ALIGN qemu_real_host_page_size @@ -549,8 +557,6 @@ struct iovec { ssize_t readv(int fd, const struct iovec *iov, int iov_cnt); ssize_t writev(int fd, const struct iovec *iov, int iov_cnt); -#else -#include <sys/uio.h> #endif #ifdef _WIN32 |