migration: 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 <[email protected]>
Message-id: 1453832250[email protected]

diff --git a/migration/block.c b/migration/block.c
index 656f38f341dadd410501535995b646656fe8bc95..a444058cf7d7a54d5e761c85f3d20e754d55d84a 100644 (file)
--- a/migration/block.c
+++ b/migration/block.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block.h"
 #include "qemu/error-report.h"
@@ -24,7 +25,6 @@
 #include "migration/migration.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
-#include <assert.h>
 
 #define BLOCK_SIZE                       (1 << 20)
 #define BDRV_SECTORS_PER_DIRTY_CHUNK     (BLOCK_SIZE >> BDRV_SECTOR_BITS)

diff --git a/migration/exec.c b/migration/exec.c
index 8406d2bbde1ba43a69a40a054d1a39c7b60659c2..f1b5e47200b81dfa62bf0694a6c25393af1d340a 100644 (file)
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -15,13 +15,13 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/sockets.h"
 #include "qemu/main-loop.h"
 #include "migration/migration.h"
 #include "migration/qemu-file.h"
 #include "block/block.h"
-#include <sys/types.h>
 #include <sys/wait.h>
 
 //#define DEBUG_MIGRATION_EXEC

diff --git a/migration/fd.c b/migration/fd.c
index 3e4bed0e065a7e1cbafbb80dd0358bf5336c26d3..c0afc96c2af66bf0385e7b6d247110a5b79fe743 100644 (file)
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/main-loop.h"
 #include "qemu/sockets.h"

diff --git a/migration/migration.c b/migration/migration.c
index aaca451cf812681d2abe80c64de447fc08889c99..2c76998cdfa1752a84bdf1439bd31b48c45afa05 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -13,6 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 3946aa98aa773311b5fb9560823e1da7dbf1362d..02b28edb72da41cad12d6f7647b2f5e83ebeaec3 100644 (file)
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -16,9 +16,8 @@
  * source to the destination before all the data has been copied.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <stdio.h>
-#include <unistd.h>
 
 #include "qemu-common.h"
 #include "migration/migration.h"
@@ -57,7 +56,6 @@ struct PostcopyDiscardState {
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <sys/syscall.h>
-#include <sys/types.h>
 #include <asm/types.h> /* for __u64 */
 #endif
 

diff --git a/migration/qemu-file-buf.c b/migration/qemu-file-buf.c
index 49516b8643a35455a1f807dfe8c26110b6ca425f..7b8e78e99c7169e0df5ac29b29ec9b999166a338 100644 (file)
--- a/migration/qemu-file-buf.c
+++ b/migration/qemu-file-buf.c
@@ -25,6 +25,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/iov.h"

diff --git a/migration/qemu-file-stdio.c b/migration/qemu-file-stdio.c
index 9bde9db5664220dd0b160259f8cd2d0975f2e17a..f402e8f7080e7ea7683834a285401139bcb1d416 100644 (file)
--- a/migration/qemu-file-stdio.c
+++ b/migration/qemu-file-stdio.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/coroutine.h"
 #include "migration/qemu-file.h"

diff --git a/migration/qemu-file-unix.c b/migration/qemu-file-unix.c
index 6ca53e7d67f7ed244d216e8544d698296ec4f711..61b059b25b85e272e9ee390ca9e6bdee483daa4d 100644 (file)
--- a/migration/qemu-file-unix.c
+++ b/migration/qemu-file-unix.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/iov.h"

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 0bbd2574a802dbe673cafdbf2931b98f1cfc5f44..6f4a1299b3100600bd22c992629538b40464bbb1 100644 (file)
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.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 <zlib.h>
 #include "qemu-common.h"
 #include "qemu/error-report.h"

diff --git a/migration/ram.c b/migration/ram.c
index e49749d03d87f3a6e4834b45a229c35ba04d952c..40d05330ab749f7269f2e1043ebd93744b6af190 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -25,7 +25,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdint.h>
+#include "qemu/osdep.h"
 #include <zlib.h>
 #include "qapi-event.h"
 #include "qemu/bitops.h"

diff --git a/migration/rdma.c b/migration/rdma.c
index dcabb91005c6bf58ccc6023f0df17fa6b5547bb8..86a13b899fdeb52159d7ba77be7095e45e48d030 100644 (file)
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -11,6 +11,7 @@
  * later.  See the COPYING file in the top-level directory.
  *
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "migration/migration.h"
 #include "migration/qemu-file.h"
@@ -20,12 +21,9 @@
 #include "qemu/sockets.h"
 #include "qemu/bitmap.h"
 #include "qemu/coroutine.h"
-#include <stdio.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <arpa/inet.h>
-#include <string.h>
 #include <rdma/rdma_cma.h>
 #include "trace.h"
 

diff --git a/migration/savevm.c b/migration/savevm.c
index b9caf597dcae7ce913812a1a634d601a6f10931c..954988d12130e93fbe540cca09bf6f96c23d50df 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -26,7 +26,7 @@
  * THE SOFTWARE.
  */
 
-#include "config-host.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/boards.h"
 #include "hw/hw.h"

diff --git a/migration/tcp.c b/migration/tcp.c
index ae891728eff094e214e924e852f96d0a408c88a1..ae80e9443d4188470e00e20b5ad6f55481c0e282 100644 (file)
--- a/migration/tcp.c
+++ b/migration/tcp.c
@@ -13,7 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include <string.h>
+#include "qemu/osdep.h"
 
 #include "qemu-common.h"
 #include "qemu/error-report.h"

diff --git a/migration/unix.c b/migration/unix.c
index b591813eb9c03b842066844dd5794f4d072208c1..a721c4aaf328580b617a78970c12ec6d0280dcc8 100644 (file)
--- a/migration/unix.c
+++ b/migration/unix.c
@@ -13,7 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include <string.h>
+#include "qemu/osdep.h"
 
 #include "qemu-common.h"
 #include "qemu/error-report.h"

diff --git a/migration/vmstate.c b/migration/vmstate.c
index a7ad7f221670f80a1861289e32e8cd014baeef4e..bf3d5db30100b23ffb81a273aa63aefc53f7eb15 100644 (file)
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "migration/migration.h"
 #include "migration/qemu-file.h"

diff --git a/migration/xbzrle.c b/migration/xbzrle.c
index 8e220bf25b9a4002675e4532b48b25ec8b47e9d6..4db3f6c5cc69799766de74716f2b7ab4afcb4ee1 100644 (file)
--- a/migration/xbzrle.c
+++ b/migration/xbzrle.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  *
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "include/migration/migration.h"