From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZz-0002Kz-91 for qemu-devel@nongnu.org; Mon, 16 May 2016 11:37:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2KZw-0006j9-4M for qemu-devel@nongnu.org; Mon, 16 May 2016 11:37:10 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:34484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2KZv-0006ia-FC for qemu-devel@nongnu.org; Mon, 16 May 2016 11:37:08 -0400 Received: by mail-wm0-x243.google.com with SMTP id n129so18907721wmn.1 for ; Mon, 16 May 2016 08:37:07 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id lf9sm34386875wjc.44.2016.05.16.08.37.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 May 2016 08:37:05 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 16 May 2016 17:36:09 +0200 Message-Id: <1463412982-6681-38-git-send-email-pbonzini@redhat.com> In-Reply-To: <1463412982-6681-1-git-send-email-pbonzini@redhat.com> References: <1463412982-6681-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 37/50] qemu-common: stop including qemu/bswap.h from qemu-common.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- audio/mixeng.c | 1 + block/bochs.c | 1 + block/cloop.c | 1 + block/parallels.c | 1 + block/qcow.c | 1 + block/qcow2-cluster.c | 1 + block/qcow2-refcount.c | 1 + block/qcow2-snapshot.c | 1 + block/qcow2.c | 1 + block/qed-table.c | 1 + block/qed.c | 1 + block/vdi.c | 1 + block/vhdx-endian.c | 1 + block/vhdx-log.c | 1 + block/vhdx.c | 1 + block/vmdk.c | 1 + block/vpc.c | 1 + block/vvfat.c | 1 + crypto/afsplit.c | 1 + crypto/block-luks.c | 1 + device_tree.c | 1 + hw/arm/nseries.c | 1 + hw/block/hd-geometry.c | 1 + hw/bt/hci-csr.c | 1 + hw/bt/l2cap.c | 1 + include/qemu-common.h | 2 -- io/channel-websock.c | 1 + nbd/nbd-internal.h | 1 + qemu-nbd.c | 1 + tests/ide-test.c | 1 + ui/vnc-ws.c | 1 + 31 files changed, 30 insertions(+), 2 deletions(-) diff --git a/audio/mixeng.c b/audio/mixeng.c index 981b97a..b4b3a4a 100644 --- 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 f0e18c0..6c8d0f3 100644 --- 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 fc1ca3a..ea5a92b 100644 --- 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 /* Maximum compressed block size */ diff --git a/block/parallels.c b/block/parallels.c index cddbfc4..88cface 100644 --- 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 d6dc1b0..cb4bf02 100644 --- 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 #include "qapi/qmp/qerror.h" #include "crypto/cipher.h" diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 31ecc10..892e0fb 100644 --- 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 ca6094f..7fa972a 100644 --- 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 5f4a17e..242fb21 100644 --- 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 62febfc..49d7cff 100644 --- 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 802945f..c841ad1 100644 --- 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 10ce18e..b591d4a 100644 --- 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 54e1144..7d9ab9c 100644 --- 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 da33cd3..c306b90 100644 --- 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 diff --git a/block/vhdx-log.c b/block/vhdx-log.c index 7ea7187..8ab7d22 100644 --- 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 ec778fe..c0d24a2 100644 --- 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 e6c97c2..1cb4b85 100644 --- 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 diff --git a/block/vpc.c b/block/vpc.c index 0379813..076a7ce 100644 --- 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 #endif diff --git a/block/vvfat.c b/block/vvfat.c index 5b0c8dd..3e484a1 100644 --- 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 8074913..825e2cf 100644 --- 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 439f892..17c4300 100644 --- 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 ccba1fd..6e06320 100644 --- 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 c7068c0..f3a9b1a 100644 --- 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 d388f13..57ad501 100644 --- 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 2e970b6..e6b8998 100644 --- 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 8065251..dfc95ed 100644 --- 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 f0d74076..dc041fc 100644 --- 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 7081787..239c75a 100644 --- 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 3791535..26a9f4d 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -27,6 +27,7 @@ #include #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 3e54113..d59b187 100644 --- 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 0d9ab4d..67e5c1f 100644 --- 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 7c79a4c..3bac46e 100644 --- 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, -- 1.8.3.1