os-posix: include sys/mman.h

qemu/osdep.h checks whether MAP_ANONYMOUS is defined, but this check is bogus without a previous inclusion of sys/mman.h. Include it in sysemu/os-posix.h and remove it from everywhere else. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-06-06 13:57:39 +02:00 · 2016-06-06 13:57:39 +02:00 · 02d0e09503
commit 02d0e09503
parent 89266923df
54 changed files with 4 additions and 68 deletions
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@ -22,7 +22,6 @@
 * THE SOFTWARE.
 */
 #include "qemu/osdep.h"
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 #include "qemu-common.h"
--- a/block/qcow2-cache.c
+++ b/block/qcow2-cache.c
@ -24,11 +24,6 @@

 /* Needed for CONFIG_MADVISE */
 #include "qemu/osdep.h"
-
-#if defined(CONFIG_MADVISE) || defined(CONFIG_POSIX_MADVISE)
-#include <sys/mman.h>
-#endif
-
 #include "block/block_int.h"
 #include "qemu-common.h"
 #include "qcow2.h"
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@ -1,7 +1,6 @@
 /* This is the Linux kernel elf-loading code, ported into user space */

 #include "qemu/osdep.h"
-#include <sys/mman.h>

 #include "qemu.h"
 #include "disas/disas.h"
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@ -18,7 +18,6 @@
 */
 #include "qemu/osdep.h"
 #include <machine/trap.h>
-#include <sys/mman.h>

 #include "qemu.h"
 #include "qemu/path.h"
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@ -17,7 +17,6 @@
 *  along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "qemu/osdep.h"
-#include <sys/mman.h>

 #include "qemu.h"
 #include "qemu-common.h"
--- a/bsd-user/syscall.c
+++ b/bsd-user/syscall.c
@ -19,7 +19,6 @@
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
 #include "qemu/path.h"
-#include <sys/mman.h>
 #include <sys/syscall.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
--- a/contrib/ivshmem-server/ivshmem-server.c
+++ b/contrib/ivshmem-server/ivshmem-server.c
@ -10,7 +10,6 @@
 #include "qemu/host-utils.h"
 #include "qemu/sockets.h"

-#include <sys/mman.h>
 #include <sys/socket.h>
 #include <sys/un.h>

--- a/exec.c
+++ b/exec.c
@ -19,7 +19,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #ifndef _WIN32
-#include <sys/mman.h>
 #endif

 #include "qemu/cutils.h"
--- a/hw/block/xen_disk.c
+++ b/hw/block/xen_disk.c
@ -21,7 +21,6 @@

 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/uio.h>

 #include "hw/hw.h"
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@ -22,7 +22,6 @@
 #include "qemu/osdep.h"
 #include <sys/select.h>
 #include <termios.h>
-#include <sys/mman.h>

 #include "hw/hw.h"
 #include "sysemu/char.h"
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@ -25,7 +25,6 @@
 */

 #include "qemu/osdep.h"
-#include <sys/mman.h>

 #include "hw/hw.h"
 #include "ui/console.h"
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@ -22,7 +22,6 @@
 */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include <sys/mman.h>
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "qemu/error-report.h"
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@ -36,8 +36,6 @@

 #include "hw/misc/ivshmem.h"

-#include <sys/mman.h>
-
 #define PCI_VENDOR_ID_IVSHMEM   PCI_VENDOR_ID_REDHAT_QUMRANET
 #define PCI_DEVICE_ID_IVSHMEM   0x1110

--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@ -36,9 +36,6 @@
 */

 #include "qemu/osdep.h"
-#if defined(CONFIG_POSIX)
-#include <sys/mman.h>
-#endif
 #include "hw/hw.h"
 #include "hw/qdev.h"
 #include "hw/isa/isa.h"
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@ -22,7 +22,6 @@
 #include "qemu/osdep.h"
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/wait.h>

 #include "hw/hw.h"
--- a/hw/usb/xen-usb.c
+++ b/hw/usb/xen-usb.c
@ -21,7 +21,6 @@

 #include "qemu/osdep.h"
 #include <libusb.h>
-#include <sys/mman.h>

 #include "qemu-common.h"
 #include "qemu/config-file.h"
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@ -20,7 +20,6 @@

 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <linux/vfio.h>

 #include "hw/vfio/vfio-common.h"
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@ -21,7 +21,6 @@
 #include "qemu/osdep.h"
 #include <linux/vfio.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>

 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@ -27,10 +27,6 @@
 #include "qapi-event.h"
 #include "trace.h"

-#if defined(__linux__)
-#include <sys/mman.h>
-#endif
-
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-access.h"

--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@ -23,7 +23,6 @@
 */

 #include "qemu/osdep.h"
-#include <sys/mman.h>
 #include <sys/signal.h>

 #include "hw/hw.h"
--- a/hw/xen/xen_pt_msi.c
+++ b/hw/xen/xen_pt_msi.c
@ -10,7 +10,6 @@
 */

 #include "qemu/osdep.h"
-#include <sys/mman.h>

 #include "hw/xen/xen_backend.h"
 #include "xen_pt.h"
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@ -197,8 +197,6 @@ void qemu_anon_ram_free(void *ptr, size_t size);

 #if defined(CONFIG_MADVISE)

-#include <sys/mman.h>
-
 #define QEMU_MADV_WILLNEED  MADV_WILLNEED
 #define QEMU_MADV_DONTNEED  MADV_DONTNEED
 #ifdef MADV_DONTFORK
--- a/include/sysemu/os-posix.h
+++ b/include/sysemu/os-posix.h
@ -26,6 +26,7 @@
 #ifndef QEMU_OS_POSIX_H
 #define QEMU_OS_POSIX_H

+#include <sys/mman.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
--- a/kvm-all.c
+++ b/kvm-all.c
@ -15,7 +15,6 @@

 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>

 #include <linux/kvm.h>

--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@ -2,7 +2,6 @@
 #include "qemu/osdep.h"
 #include <sys/param.h>

-#include <sys/mman.h>
 #include <sys/resource.h>

 #include "qemu.h"
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@ -34,7 +34,6 @@
 /****************************************************************************/

 #include "qemu/osdep.h"
-#include <sys/mman.h>

 #include "qemu.h"
 #include "flat.h"
--- a/linux-user/main.c
+++ b/linux-user/main.c
@ -18,7 +18,6 @@
 */
 #include "qemu/osdep.h"
 #include "qemu-version.h"
-#include <sys/mman.h>
 #include <sys/syscall.h>
 #include <sys/resource.h>

--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@ -17,7 +17,6 @@
 *  along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "qemu/osdep.h"
-#include <sys/mman.h>
 #include <linux/mman.h>
 #include <linux/unistd.h>

--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@ -5,7 +5,6 @@
 #include <sys/shm.h>
 #include <sys/select.h>
 #include <sys/mount.h>
-#include <sys/mman.h>
 #include <sched.h>
 #include "qemu.h"

--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@ -32,7 +32,6 @@
 #include <sys/personality.h>
 #include <sys/prctl.h>
 #include <sys/resource.h>
-#include <sys/mman.h>
 #include <sys/swap.h>
 #include <linux/capability.h>
 #include <sched.h>
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@ -51,7 +51,6 @@ struct PostcopyDiscardState {
 #if defined(__linux__)

 #include <poll.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <sys/syscall.h>
 #include <asm/types.h> /* for __u64 */
--- a/net/netmap.c
+++ b/net/netmap.c
@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <net/if.h>
-#include <sys/mman.h>
 #define NETMAP_WITH_LIBS
 #include <net/netmap.h>
 #include <net/netmap_user.h>
--- a/os-posix.c
+++ b/os-posix.c
@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include <sys/wait.h>
 /*needed for MAP_POPULATE before including qemu-options.h */
-#include <sys/mman.h>
 #include <pwd.h>
 #include <grp.h>
 #include <libgen.h>
--- a/qemu-char.c
+++ b/qemu-char.c
@ -47,7 +47,6 @@
 #include <sys/times.h>
 #include <sys/wait.h>
 #include <termios.h>
-#include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@ -105,6 +105,8 @@ for f in "$@"; do
    *include/qemu/osdep.h | \
    *include/qemu/compiler.h | \
    *include/glib-compat.h | \
+    *include/sysemu/os-posix.h | \
+    *include/sysemu/os-win32.h | \
    *include/standard-headers/ )
      # Removing include lines from osdep.h itself would be counterproductive.
      echo "SKIPPING $f (special case header)"
@ -145,6 +147,7 @@ for f in "$@"; do
           <stdlib.h> <stdio.h> <string.h> <strings.h> <inttypes.h>
           <limits.h> <unistd.h> <time.h> <ctype.h> <errno.h> <fcntl.h>
           <sys/stat.h> <sys/time.h> <assert.h> <signal.h> <glib.h>
+           <sys/stat.h> <sys/time.h> <assert.h> <signal.h> <glib.h> <sys/mman.h>
           "sysemu/os-posix.h, sysemu/os-win32.h "glib-compat.h"
           "qemu/typedefs.h"
            ))' "$f"
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@ -10,7 +10,6 @@

 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>

 #include <linux/kvm.h>

--- a/target-arm/kvm32.c
+++ b/target-arm/kvm32.c
@ -10,7 +10,6 @@

 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>

 #include <linux/kvm.h>

--- a/target-arm/kvm64.c
+++ b/target-arm/kvm64.c
@ -11,7 +11,6 @@

 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/ptrace.h>

 #include <linux/elf.h>
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@ -15,7 +15,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/utsname.h>

 #include <linux/kvm.h>
--- a/target-mips/kvm.c
+++ b/target-mips/kvm.c
@ -11,7 +11,6 @@

 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>

 #include <linux/kvm.h>

--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@ -17,7 +17,6 @@
 #include "qemu/osdep.h"
 #include <dirent.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/vfs.h>

 #include <linux/kvm.h>
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@ -23,7 +23,6 @@

 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/mman.h>

 #include <linux/kvm.h>
 #include <asm/ptrace.h>
--- a/tests/i440fx-test.c
+++ b/tests/i440fx-test.c
@ -13,7 +13,6 @@
 */

 #include "qemu/osdep.h"
-#include <sys/mman.h>

 #include "libqtest.h"
 #include "libqos/pci.h"
--- a/tests/ivshmem-test.c
+++ b/tests/ivshmem-test.c
@ -10,7 +10,6 @@

 #include "qemu/osdep.h"
 #include <glib/gstdio.h>
-#include <sys/mman.h>
 #include "contrib/ivshmem-server/ivshmem-server.h"
 #include "libqos/pci-pc.h"
 #include "libqtest.h"
--- a/tests/postcopy-test.c
+++ b/tests/postcopy-test.c
@ -26,7 +26,6 @@ const unsigned end_address = 100 * 1024 * 1024;
 bool got_stop;

 #if defined(__linux__)
-#include <sys/mman.h>
 #include <sys/syscall.h>
 #include <sys/vfs.h>
 #endif
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@ -33,7 +33,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/unistd.h>
-#include <sys/mman.h>
 #include <sys/eventfd.h>
 #include <arpa/inet.h>
 #include <netdb.h>
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@ -17,7 +17,6 @@
 #include "sysemu/sysemu.h"

 #include <linux/vhost.h>
-#include <sys/mman.h>
 #include <sys/vfs.h>
 #include <qemu/sockets.h>

--- a/translate-all.c
+++ b/translate-all.c
@ -18,8 +18,6 @@
 */
 #ifdef _WIN32
 #include <windows.h>
-#else
-#include <sys/mman.h>
 #endif
 #include "qemu/osdep.h"

--- a/util/memfd.c
+++ b/util/memfd.c
@ -29,8 +29,6 @@

 #include <glib/gprintf.h>

-#include <sys/mman.h>
-
 #include "qemu/memfd.h"

 #ifdef CONFIG_MEMFD
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@ -11,7 +11,6 @@
 */
 #include "qemu/osdep.h"
 #include <qemu/mmap-alloc.h>
-#include <sys/mman.h>

 #define HUGETLBFS_MAGIC       0x958458f6

--- a/util/osdep.c
+++ b/util/osdep.c
@ -25,10 +25,6 @@

 /* Needed early for CONFIG_BSD etc. */

-#if defined(CONFIG_MADVISE) || defined(CONFIG_POSIX_MADVISE)
-#include <sys/mman.h>
-#endif
-
 #ifdef CONFIG_SOLARIS
 #include <sys/statvfs.h>
 /* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=7156) for
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@ -36,7 +36,6 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/sockets.h"
-#include <sys/mman.h>
 #include <libgen.h>
 #include <sys/signal.h>
 #include "qemu/cutils.h"
--- a/xen-hvm.c
+++ b/xen-hvm.c
@ -9,7 +9,6 @@
 */

 #include "qemu/osdep.h"
-#include <sys/mman.h>

 #include "cpu.h"
 #include "hw/pci/pci.h"
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@ -17,7 +17,6 @@
 #include "qemu/bitmap.h"

 #include <xen/hvm/params.h>
-#include <sys/mman.h>

 #include "sysemu/xen-mapcache.h"
 #include "trace.h"