From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: patches@linaro.org
Subject: [Qemu-devel] [PATCH 17/37] 9pfs: Clean up includes
Date: Tue, 26 Jan 2016 18:17:10 +0000 [thread overview]
Message-ID: <1453832250-766-18-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1453832250-766-1-git-send-email-peter.maydell@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 <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 08d783c..fb40bdf 100644
--- a/fsdev/9p-iov-marshal.c
+++ b/fsdev/9p-iov-marshal.c
@@ -11,17 +11,12 @@
*
*/
+#include "qemu/osdep.h"
#include <glib.h>
#include <glib/gprintf.h>
-#include <sys/types.h>
-#include <sys/time.h>
#include <utime.h>
#include <sys/uio.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-#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 <glib.h>
#include <glib/gprintf.h>
-#include <sys/types.h>
#include <dirent.h>
-#include <sys/time.h>
#include <utime.h>
#include <sys/uio.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-#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 <stdio.h>
-#include <string.h>
+#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 <stdio.h>
-#include <string.h>
+#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 <sys/resource.h>
#include <getopt.h>
#include <syslog.h>
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 <arpa/inet.h>
@@ -20,7 +21,6 @@
#include <sys/un.h>
#include "qemu/xattr.h"
#include "qemu/error-report.h"
-#include <unistd.h>
#include <linux/fs.h>
#ifdef CONFIG_LINUX_MAGIC_H
#include <linux/magic.h>
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 <sys/types.h>
+#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 <sys/socket.h>
#include <sys/un.h>
#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 <sys/stat.h>
/* 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 <sys/types.h>
+#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 <stdlib.h>
-#include <string.h>
+#include "qemu/osdep.h"
#include <glib.h>
#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
next prev parent reply other threads:[~2016-01-26 18:17 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-26 18:16 [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 01/37] migration: Clean up includes Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 02/37] crypto: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 03/37] exec: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 04/37] lm32: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 05/37] ppc: " Peter Maydell
2016-01-26 18:16 ` [Qemu-devel] [PATCH 06/37] sparc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 07/37] s390: " Peter Maydell
2016-01-27 8:41 ` Cornelia Huck
2016-01-26 18:17 ` [Qemu-devel] [PATCH 08/37] unicore: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 09/37] linux-user: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 10/37] x86: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 11/37] alpha: " Peter Maydell
2016-02-06 0:48 ` Richard Henderson
2016-01-26 18:17 ` [Qemu-devel] [PATCH 12/37] arm: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 13/37] xen: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 14/37] virtio: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 15/37] tcg: " Peter Maydell
2016-02-06 0:51 ` Richard Henderson
2016-02-06 13:43 ` Peter Maydell
2016-02-06 23:49 ` Richard Henderson
2016-02-19 18:24 ` Peter Maydell
2016-02-22 19:11 ` Richard Henderson
2016-02-22 19:24 ` Peter Maydell
2016-02-22 20:07 ` Richard Henderson
2016-01-26 18:17 ` [Qemu-devel] [PATCH 16/37] ide: " Peter Maydell
2016-01-26 18:17 ` Peter Maydell [this message]
2016-01-26 18:17 ` [Qemu-devel] [PATCH 18/37] hw/net: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 19/37] usb: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 20/37] hw/display: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 21/37] hw/vfio: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 22/37] pci: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 23/37] hw/scsi: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 24/37] hw/misc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 25/37] hw/timer: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 26/37] hw/intc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 27/37] sh4: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 28/37] xtensa: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 29/37] openrisc: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 30/37] m68k: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 31/37] cris: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 32/37] moxie: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 33/37] tricore: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 34/37] tilegx: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 35/37] arm devices: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 36/37] hw/core: " Peter Maydell
2016-01-26 18:17 ` [Qemu-devel] [PATCH 37/37] hw: " Peter Maydell
2016-01-27 8:03 ` [Qemu-devel] [PATCH 00/37] clean include files to use osdep.h Paolo Bonzini
2016-01-29 16:12 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453832250-766-18-git-send-email-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=patches@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).