From fbc0412709270b9ada6acf35cbc3a2c76aab75c6 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 26 Jan 2016 18:17:10 +0000 Subject: [PATCH] 9pfs: Clean up includes Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes. Signed-off-by: Peter Maydell Message-id: 1453832250-766-18-git-send-email-peter.maydell@linaro.org --- fsdev/9p-iov-marshal.c | 7 +------ fsdev/9p-marshal.c | 7 +------ fsdev/qemu-fsdev-dummy.c | 3 +-- fsdev/qemu-fsdev-opts.c | 1 + fsdev/qemu-fsdev.c | 4 +--- fsdev/virtfs-proxy-helper.c | 1 + hw/9pfs/9p-handle.c | 2 +- hw/9pfs/9p-local.c | 1 + hw/9pfs/9p-posix-acl.c | 2 +- hw/9pfs/9p-proxy.c | 1 + hw/9pfs/9p-synth.c | 2 +- hw/9pfs/9p-xattr-user.c | 2 +- hw/9pfs/9p-xattr.c | 1 + hw/9pfs/9p.c | 1 + hw/9pfs/codir.c | 1 + hw/9pfs/cofile.c | 1 + hw/9pfs/cofs.c | 1 + hw/9pfs/coth.c | 1 + hw/9pfs/coxattr.c | 1 + tests/virtio-9p-test.c | 4 +--- 20 files changed, 20 insertions(+), 24 deletions(-) diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c index 08d783ca11..fb40bdf0d5 100644 --- a/fsdev/9p-iov-marshal.c +++ b/fsdev/9p-iov-marshal.c @@ -11,17 +11,12 @@ * */ +#include "qemu/osdep.h" #include #include -#include -#include #include #include -#include -#include -#include -#include "qemu/compiler.h" #include "9p-iov-marshal.h" #include "qemu/bswap.h" diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c index 991e35d242..183d3667c6 100644 --- a/fsdev/9p-marshal.c +++ b/fsdev/9p-marshal.c @@ -11,18 +11,13 @@ * */ +#include "qemu/osdep.h" #include #include -#include #include -#include #include #include -#include -#include -#include -#include "qemu/compiler.h" #include "9p-marshal.h" void v9fs_string_free(V9fsString *str) diff --git a/fsdev/qemu-fsdev-dummy.c b/fsdev/qemu-fsdev-dummy.c index 7dc2630a78..7622e86c16 100644 --- a/fsdev/qemu-fsdev-dummy.c +++ b/fsdev/qemu-fsdev-dummy.c @@ -10,8 +10,7 @@ * the COPYING file in the top-level directory. * */ -#include -#include +#include "qemu/osdep.h" #include "qemu-fsdev.h" #include "qemu/config-file.h" #include "qemu/module.h" diff --git a/fsdev/qemu-fsdev-opts.c b/fsdev/qemu-fsdev-opts.c index 6311c7a7e5..0b4619f44f 100644 --- a/fsdev/qemu-fsdev-opts.c +++ b/fsdev/qemu-fsdev-opts.c @@ -5,6 +5,7 @@ * later. See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/module.h" diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index 55e2f7a0fb..bf7f0b07fc 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -10,11 +10,9 @@ * the COPYING file in the top-level directory. * */ -#include -#include +#include "qemu/osdep.h" #include "qemu-fsdev.h" #include "qemu/queue.h" -#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index 44c7d88f1b..54f7ad1c48 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c @@ -9,6 +9,7 @@ * the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include #include diff --git a/hw/9pfs/9p-handle.c b/hw/9pfs/9p-handle.c index 120486b1aa..5088ef5dcb 100644 --- a/hw/9pfs/9p-handle.c +++ b/hw/9pfs/9p-handle.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "9p.h" #include "9p-xattr.h" #include @@ -20,7 +21,6 @@ #include #include "qemu/xattr.h" #include "qemu/error-report.h" -#include #include #ifdef CONFIG_LINUX_MAGIC_H #include diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index bb6662623f..ca995a79db 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "9p.h" #include "9p-xattr.h" #include "fsdev/qemu-fsdev.h" /* local_ops */ diff --git a/hw/9pfs/9p-posix-acl.c b/hw/9pfs/9p-posix-acl.c index 8df822833c..ec003181cd 100644 --- a/hw/9pfs/9p-posix-acl.c +++ b/hw/9pfs/9p-posix-acl.c @@ -11,7 +11,7 @@ * */ -#include +#include "qemu/osdep.h" #include "qemu/xattr.h" #include "9p.h" #include "fsdev/file-op-9p.h" diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 91aab43c64..0805c9cab4 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -9,6 +9,7 @@ * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include #include "9p.h" diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c index 090ae0cd4c..365623e8f3 100644 --- a/hw/9pfs/9p-synth.c +++ b/hw/9pfs/9p-synth.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "9p.h" #include "9p-xattr.h" @@ -19,7 +20,6 @@ #include "9p-synth.h" #include "qemu/rcu.h" #include "qemu/rcu_queue.h" -#include /* Root node for synth file system */ static V9fsSynthNode v9fs_synth_root = { diff --git a/hw/9pfs/9p-xattr-user.c b/hw/9pfs/9p-xattr-user.c index c490ec3bf0..f87530c8b5 100644 --- a/hw/9pfs/9p-xattr-user.c +++ b/hw/9pfs/9p-xattr-user.c @@ -11,7 +11,7 @@ * */ -#include +#include "qemu/osdep.h" #include "9p.h" #include "fsdev/file-op-9p.h" #include "9p-xattr.h" diff --git a/hw/9pfs/9p-xattr.c b/hw/9pfs/9p-xattr.c index 741dd03744..5d8595ed93 100644 --- a/hw/9pfs/9p-xattr.c +++ b/hw/9pfs/9p-xattr.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "9p.h" #include "fsdev/file-op-9p.h" #include "9p-xattr.h" diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 1f3bd12e0d..15fb0ab75d 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -11,6 +11,7 @@ * */ +#include "qemu/osdep.h" #include "hw/virtio/virtio.h" #include "hw/i386/pc.h" #include "qemu/error-report.h" diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c index 5a4f74d3e0..91df7f7a7b 100644 --- a/hw/9pfs/codir.c +++ b/hw/9pfs/codir.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" #include "qemu/coroutine.h" diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c index 893df2c422..293483e0c9 100644 --- a/hw/9pfs/cofile.c +++ b/hw/9pfs/cofile.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" #include "qemu/coroutine.h" diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c index 7b4202bd77..18c81cb3dc 100644 --- a/hw/9pfs/cofs.c +++ b/hw/9pfs/cofs.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" #include "qemu/coroutine.h" diff --git a/hw/9pfs/coth.c b/hw/9pfs/coth.c index 56772d66be..464293ef2e 100644 --- a/hw/9pfs/coth.c +++ b/hw/9pfs/coth.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "block/thread-pool.h" #include "qemu/coroutine.h" diff --git a/hw/9pfs/coxattr.c b/hw/9pfs/coxattr.c index 0590cbf5c7..6ad96ea9f6 100644 --- a/hw/9pfs/coxattr.c +++ b/hw/9pfs/coxattr.c @@ -12,6 +12,7 @@ * */ +#include "qemu/osdep.h" #include "fsdev/qemu-fsdev.h" #include "qemu/thread.h" #include "qemu/coroutine.h" diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c index 1fae47797e..59d0f1fa9b 100644 --- a/tests/virtio-9p-test.c +++ b/tests/virtio-9p-test.c @@ -7,12 +7,10 @@ * See the COPYING file in the top-level directory. */ -#include -#include +#include "qemu/osdep.h" #include #include "libqtest.h" #include "qemu-common.h" -#include "qemu/osdep.h" /* Tests only initialization so far. TODO: Replace with functional tests */ static void pci_nop(void)