From patchwork Tue Jan 26 18:17:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8126201 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0998C9F6DA for ; Tue, 26 Jan 2016 18:33:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5591201FE for ; Tue, 26 Jan 2016 18:33:13 +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 96E8E20256 for ; Tue, 26 Jan 2016 18:33:12 +0000 (UTC) Received: from localhost ([::1]:46032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8QS-0001wE-0w for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 13:33:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8BT-0006Qv-Fu for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO8BQ-0007bI-IA for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:43 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59642) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO8BQ-0007X4-9F for qemu-devel@nongnu.org; Tue, 26 Jan 2016 13:17:40 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1aO8BH-0000De-95; Tue, 26 Jan 2016 18:17:31 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 18:17:06 +0000 Message-Id: <1453832250-766-14-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1453832250-766-1-git-send-email-peter.maydell@linaro.org> References: <1453832250-766-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:8b0:1d0::1 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH 13/37] xen: Clean up includes 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable 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 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 --- hw/char/xen_console.c | 7 +------ hw/display/xenfb.c | 10 +--------- hw/net/xen_nic.c | 11 +---------- hw/xen/xen-host-pci-device.c | 1 + hw/xen/xen_backend.c | 10 +--------- hw/xen/xen_devconfig.c | 1 + hw/xen/xen_pt.c | 1 + hw/xen/xen_pt_config_init.c | 1 + hw/xen/xen_pt_graphics.c | 1 + hw/xen/xen_pt_msi.c | 1 + hw/xenpv/xen_domainbuild.c | 2 +- hw/xenpv/xen_machine_pv.c | 1 + xen-common-stub.c | 1 + xen-common.c | 1 + xen-hvm-stub.c | 1 + xen-hvm.c | 1 + xen-mapcache.c | 2 +- 17 files changed, 17 insertions(+), 36 deletions(-) diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index eb7f450..fbcbd56 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -19,14 +19,9 @@ * with this program; if not, see . */ -#include -#include -#include +#include "qemu/osdep.h" #include -#include -#include #include -#include #include #include "hw/hw.h" diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 8eb3046..e74523a 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -24,16 +24,8 @@ * with this program; if not, see . */ -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include -#include -#include -#include -#include #include "hw/hw.h" #include "ui/console.h" diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 0da16b4..dd32d58 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -19,18 +19,9 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include -#include -#include #include #include diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c index 3827ca7..9666fff 100644 --- a/hw/xen/xen-host-pci-device.c +++ b/hw/xen/xen-host-pci-device.c @@ -6,6 +6,7 @@ * */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "xen-host-pci-device.h" diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index 2510e2e..1142165 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -22,15 +22,7 @@ * TODO: add some xenbus / xenstore concepts overview here. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "qemu/osdep.h" #include #include diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c index e138dbb..1f30fe4 100644 --- a/hw/xen/xen_devconfig.c +++ b/hw/xen/xen_devconfig.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "hw/xen/xen_backend.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index d33221b..657bf6c 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -52,6 +52,7 @@ * - Set entry->pirq to '-1'. */ +#include "qemu/osdep.h" #include #include "hw/pci/pci.h" diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 81c6721..1b48f19 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -12,6 +12,7 @@ * This file implements direct PCI assignment to a HVM guest */ +#include "qemu/osdep.h" #include "qemu/timer.h" #include "hw/xen/xen_backend.h" #include "xen_pt.h" diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c index e7a7c7e..71e745f 100644 --- a/hw/xen/xen_pt_graphics.c +++ b/hw/xen/xen_pt_graphics.c @@ -1,6 +1,7 @@ /* * graphics passthrough */ +#include "qemu/osdep.h" #include "xen_pt.h" #include "xen-host-pci-device.h" #include "hw/xen/xen_backend.h" diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 302a310..5624685 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -9,6 +9,7 @@ * This file implements direct PCI assignment to a HVM guest */ +#include "qemu/osdep.h" #include #include "hw/xen/xen_backend.h" diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index ac0e5ac..e33f9b1 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -1,4 +1,4 @@ -#include +#include "qemu/osdep.h" #include "hw/xen/xen_backend.h" #include "xen_domainbuild.h" #include "qemu/timer.h" diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 23d6ef0..af1618c 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/boards.h" #include "hw/xen/xen_backend.h" diff --git a/xen-common-stub.c b/xen-common-stub.c index 906f991..699c3f1 100644 --- a/xen-common-stub.c +++ b/xen-common-stub.c @@ -5,6 +5,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/xen/xen.h" diff --git a/xen-common.c b/xen-common.c index 0dcdbc3..9ece23e 100644 --- a/xen-common.c +++ b/xen-common.c @@ -8,6 +8,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" #include "sysemu/char.h" diff --git a/xen-hvm-stub.c b/xen-hvm-stub.c index b958367..a6cb5d3 100644 --- a/xen-hvm-stub.c +++ b/xen-hvm-stub.c @@ -8,6 +8,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/xen/xen.h" #include "exec/memory.h" diff --git a/xen-hvm.c b/xen-hvm.c index a9085a8..4b54418 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -8,6 +8,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include #include "hw/pci/pci.h" diff --git a/xen-mapcache.c b/xen-mapcache.c index 97fece2..a1bb102 100644 --- a/xen-mapcache.c +++ b/xen-mapcache.c @@ -8,7 +8,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "config.h" +#include "qemu/osdep.h" #include