From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8BS-0006P7-PS for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO8BQ-0007ag-0p for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:42 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8BP-0007UI-Jg for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:39 -0500 From: Peter Maydell Date: Tue, 26 Jan 2016 18:17:10 +0000 Message-Id: <1453832250-766-18-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1453832250-766-1-git-send-email-peter.maydell@linaro.org> References: <1453832250-766-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 17/37] 9pfs: Clean up includes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org 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 --- 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 08d783c..fb40bdf 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 991e35d..183d366 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 7dc2630..7622e86 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 6311c7a..0b4619f 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 55e2f7a..bf7f0b0 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 44c7d88..54f7ad1 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 120486b..5088ef5 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 bb66626..ca995a7 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 8df8228..ec00318 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 91aab43..0805c9c 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 090ae0c..365623e 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 c490ec3..f87530c 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 741dd03..5d8595e 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 1f3bd12..15fb0ab 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 5a4f74d..91df7f7 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 893df2c..293483e 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 7b4202b..18c81cb 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 56772d6..464293e 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 0590cbf..6ad96ea 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 1fae477..59d0f1f 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) -- 1.9.1