* [PATCH] include/qemu/osdep.h: Move system includes to top
@ 2021-04-14 18:43 Peter Maydell
2021-04-15 8:47 ` Philippe Mathieu-Daudé
2021-04-15 9:33 ` Daniel P. Berrangé
0 siblings, 2 replies; 3+ messages in thread
From: Peter Maydell @ 2021-04-14 18:43 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Daniel P. Berrange
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>
---
include/qemu/osdep.h | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index ba15be9c569..38c96c72db2 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -104,6 +104,15 @@ extern 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 @@ extern int daemon(int, int);
#define WEXITSTATUS(x) (x)
#endif
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#endif
+
#ifdef _WIN32
#include "sysemu/os-win32.h"
#endif
@@ -119,10 +132,6 @@ extern int daemon(int, int);
#include "sysemu/os-posix.h"
#endif
-#ifdef __APPLE__
-#include <AvailabilityMacros.h>
-#endif
-
#include "glib-compat.h"
#include "qemu/typedefs.h"
@@ -459,7 +468,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
@@ -539,8 +547,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
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] include/qemu/osdep.h: Move system includes to top
2021-04-14 18:43 [PATCH] include/qemu/osdep.h: Move system includes to top Peter Maydell
@ 2021-04-15 8:47 ` Philippe Mathieu-Daudé
2021-04-15 9:33 ` Daniel P. Berrangé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-04-15 8:47 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Paolo Bonzini, Daniel P. Berrange
On 4/14/21 8:43 PM, Peter Maydell wrote:
> 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>
> ---
> include/qemu/osdep.h | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] include/qemu/osdep.h: Move system includes to top
2021-04-14 18:43 [PATCH] include/qemu/osdep.h: Move system includes to top Peter Maydell
2021-04-15 8:47 ` Philippe Mathieu-Daudé
@ 2021-04-15 9:33 ` Daniel P. Berrangé
1 sibling, 0 replies; 3+ messages in thread
From: Daniel P. Berrangé @ 2021-04-15 9:33 UTC (permalink / raw)
To: Peter Maydell; +Cc: Paolo Bonzini, qemu-devel
On Wed, Apr 14, 2021 at 07:43:43PM +0100, Peter Maydell wrote:
> 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>
> ---
> include/qemu/osdep.h | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-15 9:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-14 18:43 [PATCH] include/qemu/osdep.h: Move system includes to top Peter Maydell
2021-04-15 8:47 ` Philippe Mathieu-Daudé
2021-04-15 9:33 ` Daniel P. Berrangé
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).