block: 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>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/block/accounting.c b/block/accounting.c
index 185025ec1e98d72519d4fb0ccde123fa4afeca5e..3f457c4e732d77682552c7bd22ffb06af6c1134c 100644 (file)
--- a/block/accounting.c
+++ b/block/accounting.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "block/accounting.h"
 #include "block/block_int.h"
 #include "qemu/timer.h"

diff --git a/block/archipelago.c b/block/archipelago.c
index 855655c6bdf9aaf308a9cd665d7eb8efee6d5bc4..0507589063f195be5c034a14665ba93dca17727d 100644 (file)
--- a/block/archipelago.c
+++ b/block/archipelago.c
@@ -50,6 +50,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/error-report.h"
@@ -59,7 +60,6 @@
 #include "qapi/qmp/qjson.h"
 #include "qemu/atomic.h"
 
-#include <inttypes.h>
 #include <xseg/xseg.h>
 #include <xseg/protocol.h>
 

diff --git a/block/backup.c b/block/backup.c
index 705bb776612b38fc593222a92802857af255586d..00cafdbe2bc1ac69135bf0e526c5eac03fb96ce2 100644 (file)
--- a/block/backup.c
+++ b/block/backup.c
@@ -11,9 +11,7 @@
  *
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
+#include "qemu/osdep.h"
 
 #include "trace.h"
 #include "block/block.h"

diff --git a/block/blkdebug.c b/block/blkdebug.c
index 86b143dc2d6db554afc623002cae34e3c4cf7a9a..f85c54bdc8e14d7a1f3acba62399ff9d7416eb93 100644 (file)
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "block/block_int.h"

diff --git a/block/blkverify.c b/block/blkverify.c
index 1d754496bc383ce6e28c892ea136693766e54348..2a885cc08dd78e79d5141e5a8a44b666604068f0 100644 (file)
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -7,7 +7,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <stdarg.h>
+#include "qemu/osdep.h"
 #include "qemu/sockets.h" /* for EINPROGRESS on Windows */
 #include "block/block_int.h"
 #include "qapi/qmp/qdict.h"

diff --git a/block/block-backend.c b/block/block-backend.c
index e81375955f38f6d8e65712378c959d1492cb446e..efd61464da5136925a32e114bd582e4bdd615e8b 100644 (file)
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -10,6 +10,7 @@
  * or later.  See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"

diff --git a/block/bochs.c b/block/bochs.c
index 18949b9d4fbcb98721aa3cc718720f23f4984123..8b953bb44c7afabcfb13b7d592ec09818381cadc 100644 (file)
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/cloop.c b/block/cloop.c
index 4190ae06d748efa739758588776dc7a0f8ff3a4f..41bdee8d7ffe91538becfe5b62fc0260fdd550d4 100644 (file)
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/commit.c b/block/commit.c
index a5d02aa560829b696594d53f13f73da9e002c978..446a3aeadd3388fd3737b9814a0e868cb27d651a 100644 (file)
--- a/block/commit.c
+++ b/block/commit.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"

diff --git a/block/curl.c b/block/curl.c
index 89941826ed69c04c7e07dab34f50077dec5da03c..1507e0ac3402612a141ee010badcb5152a1bbd15 100644 (file)
--- a/block/curl.c
+++ b/block/curl.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "block/block_int.h"

diff --git a/block/dmg.c b/block/dmg.c
index 546a6f5330deb87e69d4984ea5b4b7c86e80122a..1018fd158efcd29d88a154e41e06b912c6a17694 100644 (file)
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/bswap.h"

diff --git a/block/gluster.c b/block/gluster.c
index 0857c146457e1dd5528b1fab0a0d9087eaac1d57..65077a0d0a92bd9d70e217daffbceec5b13b8450 100644 (file)
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -7,6 +7,7 @@
  * See the COPYING file in the top-level directory.
  *
  */
+#include "qemu/osdep.h"
 #include <glusterfs/api/glfs.h>
 #include "block/block_int.h"
 #include "qemu/uri.h"

diff --git a/block/io.c b/block/io.c
index 63e3678036e8c9aae68df5e2487f5b21818f16dd..707c04ba48d7e28315413b32d4b959b94f79153a 100644 (file)
--- a/block/io.c
+++ b/block/io.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "sysemu/block-backend.h"
 #include "block/blockjob.h"

diff --git a/block/iscsi.c b/block/iscsi.c
index 3acb052b1fa44900b9124aec69c65355800e40c4..bffd707b8b424b16fc70d3da161cc2913b37e65a 100644 (file)
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 
-#include "config-host.h"
+#include "qemu/osdep.h"
 
 #include <poll.h>
 #include <math.h>

diff --git a/block/linux-aio.c b/block/linux-aio.c
index 88b0520a8b73f5f1317fb5dd72995b203f95648a..805757e02e745a85501b32585fc48ea0f17d75f0 100644 (file)
--- a/block/linux-aio.c
+++ b/block/linux-aio.c
@@ -7,6 +7,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/aio.h"
 #include "qemu/queue.h"

diff --git a/block/mirror.c b/block/mirror.c
index f201f2b18a1fafb8b2342947a603df541040a5e7..e9e151c3412a731a50f529b8fb4599598886818b 100644 (file)
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "block/blockjob.h"
 #include "block/block_int.h"

diff --git a/block/nbd-client.c b/block/nbd-client.c
index b7fd17a1156c79efc5c65e57bea034a20f758592..568c56cbb69aee20dd905d901746248bbd0bab5f 100644 (file)
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -26,6 +26,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "nbd-client.h"
 #include "qemu/sockets.h"
 

diff --git a/block/nbd.c b/block/nbd.c
index 416f42b903e03eee942b0927a2b4fc43e4337c71..1a90bc785553bcaf704816526b76f8c50ee0e8e7 100644 (file)
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -26,6 +26,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "block/nbd-client.h"
 #include "qemu/uri.h"
 #include "block/block_int.h"
@@ -36,8 +37,6 @@
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qstring.h"
 
-#include <sys/types.h>
-#include <unistd.h>
 
 #define EN_OPTSTR ":exportname="
 

diff --git a/block/nfs.c b/block/nfs.c
index fd79f89945e52e72cd9096c55f7714d25591d725..5eb8c133b9755c2deaccd9ffe2947736c7088f03 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "config-host.h"
+#include "qemu/osdep.h"
 
 #include <poll.h>
 #include "qemu-common.h"

diff --git a/block/null.c b/block/null.c
index 7d083233fb4da5a0fab2bf8bbe23cae502db1be4..d90165dea7c40a6ef419c1d04277ea6edeebd78e 100644 (file)
--- a/block/null.c
+++ b/block/null.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "block/block_int.h"
 
 #define NULL_OPT_LATENCY "latency-ns"

diff --git a/block/parallels.c b/block/parallels.c
index e4a56a5141bf271f846ea64467a816e870061f96..ee390815dc5e589a920ec4cd895553a102f1274d 100644 (file)
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -27,6 +27,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/qapi.c b/block/qapi.c
index 58d3975001d2852eb08440ce8e1a8e04a6e0010e..a49c118ba0ded643e60b5dcea974001d656570f6 100644 (file)
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "block/qapi.h"
 #include "block/block_int.h"
 #include "block/throttle-groups.h"

diff --git a/block/qcow.c b/block/qcow.c
index 635085e27b497aa4ae83497a1d8e9c1f402b29ad..afed18fe98f0dfe2e580ec071784ac06f055b0b0 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
index 86dd7f2bd9e2ce4a99d764c2d8bbd3c98d04ea69..0fe8edae41192b95ba034886af572823ff0e905e 100644 (file)
--- a/block/qcow2-cache.c
+++ b/block/qcow2-cache.c
@@ -23,7 +23,7 @@
  */
 
 /* Needed for CONFIG_MADVISE */
-#include "config-host.h"
+#include "qemu/osdep.h"
 
 #if defined(CONFIG_MADVISE) || defined(CONFIG_POSIX_MADVISE)
 #include <sys/mman.h>
@@ -31,7 +31,6 @@
 
 #include "block/block_int.h"
 #include "qemu-common.h"
-#include "qemu/osdep.h"
 #include "qcow2.h"
 #include "trace.h"
 

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 34112c3abb5531cc46767cf56854c097a0e63584..3e887e9ab0805ff3713ff229b87e7446d30eb4c4 100644 (file)
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <zlib.h>
 
 #include "qemu-common.h"

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index af493f8bfebae539d268f3fc374588af41387de8..52a0a9ffc3596d00a5a0a87fafae9816cab1a380 100644 (file)
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "block/qcow2.h"

diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index def720164d7e3822dff5f4507d417ba93ae134ed..13f88d1b8b6b931d15c6df9be8c430f9c58e408e 100644 (file)
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "block/qcow2.h"

diff --git a/block/qcow2.c b/block/qcow2.c
index d992e7fac7a90c884a9c511c6d6c62d2f0dc16f4..e4e2754ca254d707769915afc33b8ff66fcfcf8b 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/qed-check.c b/block/qed-check.c
index 36ecd290d67ef71c78d0f3f14b2f617408c75e16..622f308976c8a00d6f0ad314f0c633d7f189bdc6 100644 (file)
--- a/block/qed-check.c
+++ b/block/qed-check.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qed.h"
 
 typedef struct {

diff --git a/block/qed-cluster.c b/block/qed-cluster.c
index f64b2af8f7ef7127956359cff9bb7486f1dea344..c24e75616a00cfcf98020b6bb88f4346daf48b78 100644 (file)
--- a/block/qed-cluster.c
+++ b/block/qed-cluster.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qed.h"
 
 /**

diff --git a/block/qed-gencb.c b/block/qed-gencb.c
index b817a8bf5092ca05c24ed9b0c6775fb4738fbb27..faf8ecc84068a908c25d83609909ed93dd56b483 100644 (file)
--- a/block/qed-gencb.c
+++ b/block/qed-gencb.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qed.h"
 
 void *gencb_alloc(size_t len, BlockCompletionFunc *cb, void *opaque)

diff --git a/block/qed-l2-cache.c b/block/qed-l2-cache.c
index e9b2aae44d9a0dca8665a011533612c988491290..5cba7946508878c65a95ea991a08f3412eecf14d 100644 (file)
--- a/block/qed-l2-cache.c
+++ b/block/qed-l2-cache.c
@@ -50,6 +50,7 @@
  * table will be deleted in favor of the existing cache entry.
  */
 
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "qed.h"
 

diff --git a/block/qed-table.c b/block/qed-table.c
index f4219b8accad95a439dc013c4b705901d14c3f70..802945f5e5b03d7b0fb74edc7464ee5f50206098 100644 (file)
--- a/block/qed-table.c
+++ b/block/qed-table.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "qemu/sockets.h" /* for EINPROGRESS on Windows */
 #include "qed.h"

diff --git a/block/qed.c b/block/qed.c
index 31f4cc9e60b405b00e74d0b8659fa97b9c402702..093d6e57d7b29f834f5d4984e160f49aa6dba5db 100644 (file)
--- a/block/qed.c
+++ b/block/qed.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu/timer.h"
 #include "trace.h"
 #include "qed.h"

diff --git a/block/quorum.c b/block/quorum.c
index 6793f126c574a776c9ecc951edebc4b9b9b93c89..a5ae4b812b97678c7864ded1baf16e8b6a9b3afd 100644 (file)
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -13,6 +13,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 816bdf7bea105511e5d414a965de5d9c00ff77b2..6df3067ddfbe309b5852f4b4c682bd5e3aa1fde5 100644 (file)
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
@@ -51,8 +52,6 @@
 #include <sys/dkio.h>
 #endif
 #ifdef __linux__
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <linux/cdrom.h>

diff --git a/block/raw-win32.c b/block/raw-win32.c
index 2d0907a8222299a9066c667e325c25842204d9b1..21a6cb89d7b2398614b17f1658201ae802fbf8a4 100644 (file)
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "block/block_int.h"

diff --git a/block/raw_bsd.c b/block/raw_bsd.c
index 915d6fd0e683cd9573a2824169a501be0cb78157..bcaee115e17320f6b4187cf67a759c1290366382 100644 (file)
--- a/block/raw_bsd.c
+++ b/block/raw_bsd.c
@@ -26,6 +26,7 @@
  * IN THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "block/block_int.h"
 #include "qemu/option.h"
 

diff --git a/block/rbd.c b/block/rbd.c
index a60a19d58d01b7f37600a36bb2dcbe4ca93f5da3..51b64f3fed7e3e3fd992ad3fd4fefe53a48373f7 100644 (file)
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -11,7 +11,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "qemu-common.h"
 #include "qemu/error-report.h"

diff --git a/block/sheepdog.c b/block/sheepdog.c
index 6986be8151d0014d95ef5bd8c621541d7d399e99..ff89298b134d18df990651e6f317502cd2e51d4b 100644 (file)
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -12,6 +12,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/uri.h"
 #include "qemu/error-report.h"

diff --git a/block/snapshot.c b/block/snapshot.c
index 2d86b88a283472c81168b2a95106b8b15bd6735c..17a27b57ad37985e2cd54e8a0bd740b6a80c33bd 100644 (file)
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "block/snapshot.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qerror.h"

diff --git a/block/ssh.c b/block/ssh.c
index af025c08a09a23b0fb43fbc8857c77098d923325..04deeba1ad7e77ffa7cb015fc7ea653358635c52 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include "qemu/osdep.h"
 
 #include <libssh2.h>
 #include <libssh2_sftp.h>

diff --git a/block/stream.c b/block/stream.c
index 25af7eff62b43abb4d893903c29ecfee7b15ab92..cafaa07a0195c2751bf6eae6f386a60b5c143bd8 100644 (file)
--- a/block/stream.c
+++ b/block/stream.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"

diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index 13b5baa5d7825d5436abe98ef16cb090eea9b591..4920e094950a66b8d39278e76f03632becbd22fc 100644 (file)
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -22,6 +22,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "block/throttle-groups.h"
 #include "qemu/queue.h"
 #include "qemu/thread.h"

diff --git a/block/vdi.c b/block/vdi.c
index 17f435fad6b266ef5f814d0f973ed19da9e3ecb5..61bcd54575592fdc8fa13fecbcef090c1e1e5c16 100644 (file)
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -49,6 +49,7 @@
  * so this seems to be reasonable.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
index 0640d3f4a97dbe14143806806db0c34a1cc49c38..da33cd38efb4d6f2cdae3deaf4fcbbe327ed96dd 100644 (file)
--- a/block/vhdx-endian.c
+++ b/block/vhdx-endian.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "block/vhdx.h"

diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index ab86416defcbbfe04da87f790a02515c50efd160..369076126e49773b7e6724832cc2a4d909283f74 100644 (file)
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -17,6 +17,7 @@
  * See the COPYING.LIB file in the top-level directory.
  *
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/error-report.h"

diff --git a/block/vhdx.c b/block/vhdx.c
index 2fe9a5e0cfadccf45973c134c8c34d762f2a0f3e..72042e90820e23d308e9090093d92025d79da34e 100644 (file)
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/vmdk.c b/block/vmdk.c
index 2b5cb00ef1ad4977bcddad5f7ccff5cd099a092e..6b8596c3626249c2fef10b3b7e3ee81a7586a751 100644 (file)
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qerror.h"

diff --git a/block/vpc.c b/block/vpc.c
index 299d373092251ce6d02894d4558bdba01bafffb6..d852f966a0dc181f965369692c8f8df09c3c0d67 100644 (file)
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/vvfat.c b/block/vvfat.c
index b184eca6fc4fa10053ae045c9f8382a2120f9d0a..2ea5a4ab0b5c376bc8fd57aebd92b4635d4fae11 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <sys/stat.h>
+#include "qemu/osdep.h"
 #include <dirent.h>
 #include "qemu-common.h"
 #include "block/block_int.h"

diff --git a/block/win32-aio.c b/block/win32-aio.c
index bbf2f01c12d6931c5510a9eb2035a7407a40953a..2d509a9a7bbfe38d99afd448c2b074e3e8b98718 100644 (file)
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "block/block_int.h"

diff --git a/block/write-threshold.c b/block/write-threshold.c
index 0fe38917c58e1793ea77acfaee44fb08edf35a5d..cc2ca71835e98de8badbc5ac5e18079f4187a1b8 100644 (file)
--- a/block/write-threshold.c
+++ b/block/write-threshold.c
@@ -10,6 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "block/block_int.h"
 #include "qemu/coroutine.h"
 #include "block/write-threshold.h"

diff --git a/hw/block/block.c b/hw/block/block.c
index f7243e5b948fddda88fda8f51f7f7b490ef7f704..960df2b9d02d3c182dc5f1590ff0efe91812649e 100644 (file)
--- a/hw/block/block.c
+++ b/hw/block/block.c
@@ -7,6 +7,7 @@
  * later.  See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"

diff --git a/hw/block/cdrom.c b/hw/block/cdrom.c
index 4e1019c890eee19c61b54c2486a419a8e07be75c..da937fe33ac61d72f6a074e9d7e96f11f992d443 100644 (file)
--- a/hw/block/cdrom.c
+++ b/hw/block/cdrom.c
@@ -25,6 +25,7 @@
 /* ??? Most of the ATAPI emulation is still in ide.c.  It should be moved
    here.  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/scsi/scsi.h"
 

diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index b8ce6cd5f31283a59b172c8359053832338ca799..bc34046fb5060d19cc6430057c833de86189ffab 100644 (file)
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "trace.h"
 #include "qemu/iov.h"
 #include "qemu/thread.h"

diff --git a/hw/block/ecc.c b/hw/block/ecc.c
index 10bb2330894ac648ccf53e543277966a2e1985a8..48311d26091be07a3c7c8db88046c2df36e5ebaa 100644 (file)
--- a/hw/block/ecc.c
+++ b/hw/block/ecc.c
@@ -11,6 +11,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/block/flash.h"
 

diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 858f5f7ce7299ba446ddc60a1dd0401684ef1efa..6711c6ac1a6129e44026025b366b288cf6009b59 100644 (file)
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -27,6 +27,7 @@
  * way. There are changes in DOR register and DMA is not available.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/block/fdc.h"
 #include "qemu/error-report.h"

diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c
index b187878facfc7199eb15c90cd4547a51713b8d02..6d02192dbb40c8b428d60161e4b17098bec7351e 100644 (file)
--- a/hw/block/hd-geometry.c
+++ b/hw/block/hd-geometry.c
@@ -30,6 +30,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"
 #include "trace.h"

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index efc43dde6a4b4415117751510ee2e0c3cdaaddbe..4bbf90d461196b4c586487d33701338b5d6b27ba 100644 (file)
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -21,6 +21,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 169e4fa7a5c107b0d93d96c9eefaf44b11051fc5..a5fedb2906df0a187c20571551723aa2a3a38b31 100644 (file)
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -20,6 +20,7 @@
  *      -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>
  */
 
+#include "qemu/osdep.h"
 #include <hw/block/block.h>
 #include <hw/hw.h>
 #include <hw/pci/msix.h>

diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 58eff508bf633623032d18751d45b1fd9a9eec53..91896851f5b3324b9e7b17a624266227b6923029 100644 (file)
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "hw/block/flash.h"

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 2ba6c772932db39cdff46f42f3ec5d33f5ea9790..a4c4fa1c69e370298fab4e01f414fc96eb333107 100644 (file)
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -36,6 +36,7 @@
  * It does not implement much more ...
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/block/flash.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 074a005f69fd81f38337244f38a534c467e6e5da..aaa697adbbfba545d4e3ae044edb03f6ac43fdd5 100644 (file)
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -35,6 +35,7 @@
  * It does not implement multiple sectors erase
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/block/flash.h"
 #include "qemu/timer.h"

diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
index 728f1c3b6892ffa8d69d8c9f19277c13bdb439cd..7909d5041ec149d9c78442940618ae0112978f3c 100644 (file)
--- a/hw/block/tc58128.c
+++ b/hw/block/tc58128.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "hw/loader.h"

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 51f867b51356e77f996f5fdea273444fc5084abd..11bedff6d6793766f283b3e9bcc64a4ad1ce0120 100644 (file)
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -11,6 +11,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/iov.h"
 #include "qemu/error-report.h"

diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
index a48e726f4a158f6494159adeec11c9456a2ec6a6..571f651008d68f6f1c52658baac972d1807126f9 100644 (file)
--- a/hw/block/xen_disk.c
+++ b/hw/block/xen_disk.c
@@ -19,18 +19,8 @@
  *  GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <time.h>
-#include <fcntl.h>
-#include <errno.h>
+#include "qemu/osdep.h"
 #include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/uio.h>
 

diff --git a/qemu-img.c b/qemu-img.c
index 67739439c5c4263e3cac6b73a67874461c17b562..33e451c101c45db6a9dab8ebbeafd45c2cc6a5ff 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qapi-visit.h"
 #include "qapi/qmp-output-visitor.h"
 #include "qapi/qmp/qerror.h"
@@ -28,7 +29,6 @@
 #include "qemu-common.h"
 #include "qemu/option.h"
 #include "qemu/error-report.h"
-#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index 18fc2bdc10f79cd7fd70ac719d57b8df9b3aded0..e929d24a490fbd1f895c1d637a53fdbec9402f95 100644 (file)
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -8,6 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-io.h"
 #include "sysemu/block-backend.h"
 #include "block/block.h"

diff --git a/qemu-io.c b/qemu-io.c
index d47228a963ade968a2560288fd93654d6b2d6e56..d593f196426356a2c1d49058f1ab86959933d54e 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -7,10 +7,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
-#include <sys/time.h>
-#include <sys/types.h>
-#include <stdarg.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include <getopt.h>
 #include <libgen.h>