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 <peter.maydell@linaro.org>
Message-id: 1453832250-766-18-git-send-email-peter.maydell@linaro.org

diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c
index 08d783ca1172c6ec397469cdf21c1f3e3422ad09..fb40bdf0d5f62f3e1d1146b83f3f17ff6bfbbf30 100644 (file)
--- 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 991e35d24280d70539325b471ec968f0762fb055..183d3667c68170e2193367a7bcf02b032eda9aaa 100644 (file)
--- 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 7dc2630a78224c09687ca39c19d8e92637b8160f..7622e86c16829f9d31215a10b080feb627de9531 100644 (file)
--- 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 6311c7a7e562db230fad10c2693d689f125d0e7b..0b4619f44f49bafb9aa38e9741b065cde0a9c624 100644 (file)
--- 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 55e2f7a0fb58a9edf328a8be577787a52e6ba7de..bf7f0b07fc22cd318f5d60a380f5d343a578ca69 100644 (file)
--- 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 44c7d88f1bdac43e4a7af545b34ce2f5caedb8b7..54f7ad1c48f0fe529f77de3b9ddf48119ed801e6 100644 (file)
--- 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 120486b1aa99463cc4c06053dc253d5fc1acdd8c..5088ef5dcb3d3f09af91974a1df09e8ab9740a79 100644 (file)
--- 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 bb6662623ff76d91e71b8aa3d6d2415511155095..ca995a79dba8caee735f7f8e855f541dc35b9231 100644 (file)
--- 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 8df822833c523111acdd7fffec5ef3e6ddf9e084..ec003181cd33d6e3c87f5a9b448e3f99d43c770f 100644 (file)
--- 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 91aab43c647c375be8a8ac329601ff15f3cd45b9..0805c9cab4132e36bb043cd5f68a0f8d7e793308 100644 (file)
--- 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 090ae0cd4c318305cb396d3dcbf36a1e36cd0fbb..365623e8f3ade61fa0ed64eb60e702daf2027efe 100644 (file)
--- 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 c490ec3bf0a6ea448cf9fb0b2a215c3d6b47c3ad..f87530c8b5269f914ce0b0527acf6857aa69b596 100644 (file)
--- 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 741dd03744beefad3b3c982e8eb53e1333353fe6..5d8595ed932a6f1431faba4e93bf16d1f86898ac 100644 (file)
--- 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 1f3bd12e0d0cd0439ca007837273fa2a4a4d7f61..15fb0ab75d8e38869d2a79ba8d35a8f1ea7975f7 100644 (file)
--- 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 5a4f74d3e069f004c3b8b9c291b5fc4a40b19f71..91df7f7a7b8d1f6b7a0eea576a0f4f4b0c0b7420 100644 (file)
--- 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 893df2c422478d63c9d976f8fd05ab8fc8c78233..293483e0c92712a60b6894ad1700c31bbab35795 100644 (file)
--- 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 7b4202bd772875b4a76d4c53f44a7d5c1bd92f70..18c81cb3dcf62cc6bebb3f6c6392299990b3811d 100644 (file)
--- 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 56772d66be89c039b686b899db5479ae6a58568c..464293ef2e28082ea8674cec9f695eb614aff1da 100644 (file)
--- 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 0590cbf5c7c8172662294bdcd981e2c973d6b1dd..6ad96ea9f60dfb78ca272f088fb931264790a0f5 100644 (file)
--- 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 1fae47797e14806afa90a3ea3c0f3c7b435cf682..59d0f1fa9b41e5b285349e869949d3556b58e832 100644 (file)
--- 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)