From patchwork Wed Mar 16 10:46:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8598541 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 80469C0553 for ; Wed, 16 Mar 2016 11:11:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C427202BE for ; Wed, 16 Mar 2016 11:11:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2F858202AE for ; Wed, 16 Mar 2016 11:11:55 +0000 (UTC) Received: from localhost ([::1]:55165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag9Mo-0004cu-G4 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 07:11:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zR-0003ef-Fc for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag8zP-0002Gm-Kp for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:45 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:36162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zP-0002Gg-Ay for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:43 -0400 Received: by mail-wm0-x231.google.com with SMTP id l124so43292105wmf.1 for ; Wed, 16 Mar 2016 03:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=UuUJmcGYLNGXsPjdfaz7pxBYUHM2OLGCHUkkIPwitOk=; b=iXGwrPzYppJ0IvVqfu72TPQ1YH3U7NyaFrFIQ8xZ4a6lIzAzj0XYbzJwWjD0NNjrwU xdfy6gkgAd3uGrilqOWLrldJCNVaI3tDfWOI8HI3HKIPHwf8If0hcmoCeM3LNPeDEPEb naTzNNNJQ02PVrADq19TkZBAKjKO07SzgkvK6TK7wBHUFg8c6g2QqkX6DjoSx2B8VCSD H7QqFDDcksCr+mlMLRW8Gsz/waKpg5NwzDQY4dZF6DH027p3reL7LCTdIZ5Y/oHxeg8y nBA8+IBDBMfeCUd14mJj5goMaQbDY0/4CVIIOnfqQ19HvywJrEH3WsmPnK+UQBJCn26m FppA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=UuUJmcGYLNGXsPjdfaz7pxBYUHM2OLGCHUkkIPwitOk=; b=S0y52UzxAo4c0KGRFA5NNYoLKbrUlBZEI1M8eYkl6wPPDkAU45j2NxEmylaRv7FvDn ZThs3CumLzstRtpJlum4kaFoCtHQ9LBU2FhACiwyJove4QJjMv0G3kW07pgfJIGiEIx5 bSbMwq+5uNUatXOVkuv9rOgsW1V2dVM8+L7gH7vfoW8jLdKHkyPChIBT2MpwPx0zW2RJ N2fuot4eY3ZB1ArUGfspLm9PylUx8z0EFSPcvx6+Ax1PccEuC1BHg5sJQK1ZuJBkkxf2 gP92P3YxUjirDqg/SCXBzRTrZJubTUiEJj0CqqBMEg3iikTWdMDDaf6B0irtRPVIodDP vxyA== X-Gm-Message-State: AD7BkJJb/sq0j3SIQIlivdZAwZTEmwrkdf1LsUNb193iNP+ExvP+kc8iTFLshwMh/ajbAg== X-Received: by 10.28.177.132 with SMTP id a126mr27383160wmf.86.1458125262676; Wed, 16 Mar 2016 03:47:42 -0700 (PDT) Received: from 640k.lan (94-39-161-17.adsl-ull.clienti.tiscali.it. [94.39.161.17]) by smtp.gmail.com with ESMTPSA id wr2sm2418094wjc.49.2016.03.16.03.47.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 03:47:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 11:46:47 +0100 Message-Id: <1458125219-131698-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> References: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PATCH 37/49] qemu-common: stop including qemu/bswap.h from qemu-common.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 + 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 + 29 files changed, 28 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 af8b7ab..42d7c33 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 a84f140..f5d3123 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 dfba8d4..0e7e799 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -32,6 +32,7 @@ #include "qemu-common.h" #include "block/block_int.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 4485819..b4e2c09 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -26,6 +26,7 @@ #include "qemu-common.h" #include "block/block_int.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 269acc2..8720f56 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -27,6 +27,7 @@ #include "qemu-common.h" #include "block/block_int.h" #include "block/qcow2.h" +#include "qemu/bswap.h" #include "qemu/error-report.h" void qcow2_free_snapshots(BlockDriverState *bs) diff --git a/block/qcow2.c b/block/qcow2.c index 8babecd..56781af 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -35,6 +35,7 @@ #include "qapi-event.h" #include "trace.h" #include "qemu/option_int.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 3679a32..9b97c2c 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 8b791f4..000fc43 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -54,6 +54,7 @@ #include "qemu-common.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/bswap.h" #include "migration/migration.h" #include "qemu/coroutine.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 cbb54d8..f0bbab2 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -21,6 +21,7 @@ #include "block/block_int.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 c1eb2b5..42f788c 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 #include diff --git a/block/vpc.c b/block/vpc.c index d60f692..77d0248 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -28,6 +28,7 @@ #include "block/block_int.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 bdce8da..7ff3a32 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -28,6 +28,7 @@ #include "qemu-common.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/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 644315f..b6e1bf4 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-common.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 6d02192..be7503a 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 0189b0a..143f14f 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 eccdb07..24823be 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 d09b4ee..32d0b62 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 4cf9b9e..0b03df6 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -25,6 +25,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,