qemu-common: stop including qemu/bswap.h from qemu-common.h

Move it to the actual users.  There are still a few includes of
qemu/bswap.h in headers; removing them is left for future work.

Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/audio/mixeng.c b/audio/mixeng.c
index 61ef8691a3ce2d09484bd4fef8e6e37e3c6abd07..66c0328d4288b931a7dafe6f40728920f9110b75 100644 (file)
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -24,6 +24,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "qemu/bswap.h"
 #include "audio.h"
 
 #define AUDIO_CAP "mixeng"

diff --git a/block/bochs.c b/block/bochs.c
index f0e18c0b84ddfbdbfcc35591e5ca1b9815f39db1..6c8d0f34267b4ee5411933f17fb760c77ce09392 100644 (file)
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -27,6 +27,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
+#include "qemu/bswap.h"
 
 /**************************************************************/
 

diff --git a/block/cloop.c b/block/cloop.c
index fc1ca3a05af0a92d1a5d25cd39cceedda61b2051..ea5a92b6d431a8af36de5ba367d3771b951f7cd3 100644 (file)
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -26,6 +26,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
+#include "qemu/bswap.h"
 #include <zlib.h>
 
 /* Maximum compressed block size */

diff --git a/block/parallels.c b/block/parallels.c
index cddbfc4012c0f904b1ddb205f45ff088a04b8056..88cfacebe3bca5c7f8bac2c53fef6e11f37d59eb 100644 (file)
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -33,6 +33,7 @@
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
+#include "qemu/bswap.h"
 #include "qemu/bitmap.h"
 #include "qapi/util.h"
 

diff --git a/block/qcow.c b/block/qcow.c
index d6dc1b05b37cfa9be4e102a28cd6547c4deca98e..cb4bf0299f7589bf3843816336b28e3ef9a16a19 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -28,6 +28,7 @@
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
+#include "qemu/bswap.h"
 #include <zlib.h>
 #include "qapi/qmp/qerror.h"
 #include "crypto/cipher.h"

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 31ecc1030452be1e536c468ab5ef3e6f12d6be1d..892e0fbfbf1cda50c6fd881d75e9383c4054795c 100644 (file)
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -29,6 +29,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "block/qcow2.h"
+#include "qemu/bswap.h"
 #include "trace.h"
 
 int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index ca6094ff5bb966790c027682757f15b2bab93413..7fa972a38382746b8424bc0c749a48388c993f70 100644 (file)
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -28,6 +28,7 @@
 #include "block/block_int.h"
 #include "block/qcow2.h"
 #include "qemu/range.h"
+#include "qemu/bswap.h"
 
 static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size);
 static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,

diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 5f4a17e473d8e52b753b2828da20618bd3e51396..242fb21d6ed4fbfc29d132c28c9aa659280131f7 100644 (file)
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -26,6 +26,7 @@
 #include "qapi/error.h"
 #include "block/block_int.h"
 #include "block/qcow2.h"
+#include "qemu/bswap.h"
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"
 

diff --git a/block/qcow2.c b/block/qcow2.c
index 62febfc38699f72d1b9bb81619d642f664f69dd8..49d7cff17afed473e3bf6167dcce59b5bdcb112e 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -36,6 +36,7 @@
 #include "trace.h"
 #include "qemu/option_int.h"
 #include "qemu/cutils.h"
+#include "qemu/bswap.h"
 
 /*
   Differences with QCOW:

diff --git a/block/qed-table.c b/block/qed-table.c
index 802945f5e5b03d7b0fb74edc7464ee5f50206098..c841ad10fe199009196adbda6133b16c0900088a 100644 (file)
--- a/block/qed-table.c
+++ b/block/qed-table.c
@@ -16,6 +16,7 @@
 #include "trace.h"
 #include "qemu/sockets.h" /* for EINPROGRESS on Windows */
 #include "qed.h"
+#include "qemu/bswap.h"
 
 typedef struct {
     GenericCB gencb;

diff --git a/block/qed.c b/block/qed.c
index 10ce18eb660378cca8d4720278ff027dc3db94a7..b591d4a3fc0de970d4dcd07d67cc1959dcbbaf7b 100644 (file)
--- a/block/qed.c
+++ b/block/qed.c
@@ -15,6 +15,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
+#include "qemu/bswap.h"
 #include "trace.h"
 #include "qed.h"
 #include "qapi/qmp/qerror.h"

diff --git a/block/vdi.c b/block/vdi.c
index 54e11447c3afead268790149d2176638a397424a..7d9ab9cc17c37e7e4de43d471016d66ef8b6dda8 100644 (file)
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -54,6 +54,7 @@
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
+#include "qemu/bswap.h"
 #include "migration/migration.h"
 #include "qemu/coroutine.h"
 #include "qemu/cutils.h"

diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
index da33cd38efb4d6f2cdae3deaf4fcbbe327ed96dd..c306b90d5446d83dcc1ecb2eae50825a37cd72cf 100644 (file)
--- a/block/vhdx-endian.c
+++ b/block/vhdx-endian.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
+#include "qemu/bswap.h"
 #include "block/vhdx.h"
 
 #include <uuid/uuid.h>

diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index 7ea7187fc4625ad2017729e6cac0fc5b4832b7f6..8ab7d22d9a6b334481f3f08934feabdd0d6658db 100644 (file)
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -23,6 +23,7 @@
 #include "block/block_int.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
+#include "qemu/bswap.h"
 #include "block/vhdx.h"
 
 

diff --git a/block/vhdx.c b/block/vhdx.c
index ec778fe2a77dd06eb2e183cbb94f3cf7546d702f..c0d24a24ee829f81897279e3e69943e5d203c5b3 100644 (file)
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -22,6 +22,7 @@
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
 #include "qemu/crc32c.h"
+#include "qemu/bswap.h"
 #include "block/vhdx.h"
 #include "migration/migration.h"
 

diff --git a/block/vmdk.c b/block/vmdk.c
index e6c97c25a6b8d91ec19d845723c83f7c149f5107..1cb4b8529c6e60d18e6b8ff27237396a08f2d1d8 100644 (file)
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -30,6 +30,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
+#include "qemu/bswap.h"
 #include "migration/migration.h"
 #include "qemu/cutils.h"
 #include <zlib.h>

diff --git a/block/vpc.c b/block/vpc.c
index 0379813e2fd6cced6f94136c8b03619490ce283b..076a7ce399e84cfdd79d7f5ef95bd133c9521400 100644 (file)
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -29,6 +29,7 @@
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
 #include "migration/migration.h"
+#include "qemu/bswap.h"
 #if defined(CONFIG_UUID)
 #include <uuid/uuid.h>
 #endif

diff --git a/block/vvfat.c b/block/vvfat.c
index 5b0c8dd639d12175872d4aa52b7ee2899b3a2753..3e484a1dcc8d87325331dd68802cef3b9b4d9768 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -27,6 +27,7 @@
 #include "qapi/error.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
+#include "qemu/bswap.h"
 #include "migration/migration.h"
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qbool.h"

diff --git a/crypto/afsplit.c b/crypto/afsplit.c
index 8074913cdd36cc685d872c861ddee43da057b21c..825e2cff26ecc60c841395d350c92ee389fe8630 100644 (file)
--- a/crypto/afsplit.c
+++ b/crypto/afsplit.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/bswap.h"
 #include "crypto/afsplit.h"
 #include "crypto/random.h"
 

diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index 439f89230c9f5a86a6d7217e3b8951a3b994e339..17c4300f1121fb4aaed9cbbd98a47a87b1cda3c3 100644 (file)
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/bswap.h"
 
 #include "crypto/block-luks.h"
 

diff --git a/device_tree.c b/device_tree.c
index ccba1fd4a4a15f7e729d795e222a576d3283c696..6e0632083094de0550643573527648422e9c24a4 100644 (file)
--- a/device_tree.c
+++ b/device_tree.c
@@ -20,6 +20,7 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "qemu/bswap.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/sysemu.h"
 #include "hw/loader.h"

diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index c7068c0d38042c2abfc12bd0b03bc7ee92c898fd..f3a9b1a82615209a5b8ea55c758465b317a84b9b 100644 (file)
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
+#include "qemu/bswap.h"
 #include "sysemu/sysemu.h"
 #include "hw/arm/omap.h"
 #include "hw/arm/arm.h"

diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c
index d388f13e9deb51555961704782e96b5b947466d6..57ad5012a700a0dba6fc6225d66f7ad84dd44a51 100644 (file)
--- a/hw/block/hd-geometry.c
+++ b/hw/block/hd-geometry.c
@@ -32,6 +32,7 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
+#include "qemu/bswap.h"
 #include "hw/block/block.h"
 #include "trace.h"
 

diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index 2e970b65614203b59f86f468fc4cf1929e0ae876..e6b89982535c198d8ff40358e176f7d9aa18adaf 100644 (file)
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -22,6 +22,7 @@
 #include "qemu-common.h"
 #include "sysemu/char.h"
 #include "qemu/timer.h"
+#include "qemu/bswap.h"
 #include "hw/irq.h"
 #include "sysemu/bt.h"
 #include "hw/bt.h"

diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c
index 8065251947c0bad11723c0cd6a0b4c92272832c3..dfc95ed0487928ef00c1e36341c48755f84cb6b5 100644 (file)
--- a/hw/bt/l2cap.c
+++ b/hw/bt/l2cap.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
+#include "qemu/bswap.h"
 #include "hw/bt.h"
 
 #define L2CAP_CID_MAX  0x100   /* Between 0x40 and 0x10000 */

diff --git a/include/qemu-common.h b/include/qemu-common.h
index f0d740768006b288865d66edc14f691c8261620e..dc041fc2f4a41343761867c411c95f6e074f81b5 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -23,8 +23,6 @@
 #include "qemu/option.h"
 #include "qemu/host-utils.h"
 
-#include "qemu/bswap.h"
-
 /* FIXME: Remove NEED_CPU_H.  */
 #ifdef NEED_CPU_H
 #include "cpu.h"

diff --git a/io/channel-websock.c b/io/channel-websock.c
index 708178779e736f8bd9ee2fb5096d9d8c482bf4dc..239c75a9794ae5c7fc380ed4600bee2c1a001d6e 100644 (file)
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/bswap.h"
 #include "io/channel-websock.h"
 #include "crypto/hash.h"
 #include "trace.h"

diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h
index 379153561dda19e58a296acece7630fcd67d0c84..26a9f4d9fd32c4af6fa8ba029649922661edcd2a 100644 (file)
--- a/nbd/nbd-internal.h
+++ b/nbd/nbd-internal.h
@@ -27,6 +27,7 @@
 #include <linux/fs.h>
 #endif
 
+#include "qemu/bswap.h"
 #include "qemu/queue.h"
 #include "qemu/main-loop.h"
 

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 3e541131f457f808da8e9255cd48e794669833ce..d59b18778020f0267b5e4bf291be675526d35f4b 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -26,6 +26,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/error-report.h"
 #include "qemu/config-file.h"
+#include "qemu/bswap.h"
 #include "block/snapshot.h"
 #include "qapi/util.h"
 #include "qapi/qmp/qstring.h"

diff --git a/tests/ide-test.c b/tests/ide-test.c
index 0d9ab4df95a28b487e1ff1ea1d61a094234ccbad..67e5c1f5cc74f7d76624149c8d3210a7d703cabd 100644 (file)
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -32,6 +32,7 @@
 #include "libqos/malloc-pc.h"
 
 #include "qemu-common.h"
+#include "qemu/bswap.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/pci/pci_regs.h"
 

diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index 7c79a4c3724d67aeb94447734ed28e272e87ca67..3bac46e7741089ac8156a91633962cf93eba784e 100644 (file)
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -22,6 +22,7 @@
 #include "qapi/error.h"
 #include "vnc.h"
 #include "io/channel-websock.h"
+#include "qemu/bswap.h"
 
 static void vncws_tls_handshake_done(Object *source,
                                      Error *err,