SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

include/qemu/osdep.h: Move system includes to top

Browse Source 
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
This commit is contained in:
Peter Maydell 2021-04-16 14:55:40 +01:00
parent 875df03b22
commit ec63ca2d35
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/qemu/osdep.h
View File

@ -104,6 +104,15 @@ QEMU_EXTERN_C int daemon(int, int);
#include <setjmp.h> #include <setjmp.h>
#include <signal.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 #ifndef _WIN32
#include <sys/wait.h> #include <sys/wait.h>
#else #else
@ -111,6 +120,10 @@ QEMU_EXTERN_C int daemon(int, int);
#define WEXITSTATUS(x) (x) #define WEXITSTATUS(x) (x)
#endif #endif
#ifdef __APPLE__
#include <AvailabilityMacros.h>
#endif
/* /*
* This is somewhat like a system header; it must be outside any extern "C" * This is somewhat like a system header; it must be outside any extern "C"
* block because it includes system headers itself, including glib.h, * block because it includes system headers itself, including glib.h,
@ -130,10 +143,6 @@ extern "C" {
#include "sysemu/os-posix.h" #include "sysemu/os-posix.h"
#endif #endif
#ifdef __APPLE__
#include <AvailabilityMacros.h>
#endif
#include "qemu/typedefs.h" #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. */ /* Use 1 MiB (segment size) alignment so gmap can be used by KVM. */
# define QEMU_VMALLOC_ALIGN (256 * 4096) # define QEMU_VMALLOC_ALIGN (256 * 4096)
#elif defined(__linux__) && defined(__sparc__) #elif defined(__linux__) && defined(__sparc__)
#include <sys/shm.h>
# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA) # define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)
#else #else
# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size # 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 readv(int fd, const struct iovec *iov, int iov_cnt);
ssize_t writev(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 #endif
#ifdef _WIN32 #ifdef _WIN32