From patchwork Fri Jan 29 17:49:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8165991 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 04914BEEE5 for ; Fri, 29 Jan 2016 18:06:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 463BE20389 for ; Fri, 29 Jan 2016 18:06:33 +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 6D78620361 for ; Fri, 29 Jan 2016 18:06:32 +0000 (UTC) Received: from localhost ([::1]:35975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPDRH-0000mX-P9 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Jan 2016 13:06:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPDBT-000328-GQ for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:50:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPDBS-0001w0-Ab for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:50:11 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPDBR-0001uk-VO for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:50:10 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1aPDBN-0001RD-UK; Fri, 29 Jan 2016 17:50:05 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 29 Jan 2016 17:49:58 +0000 Message-Id: <1454089805-5470-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1454089805-5470-1-git-send-email-peter.maydell@linaro.org> References: <1454089805-5470-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 08/15] qga: 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 --- qga/channel-posix.c | 7 +------ qga/channel-win32.c | 5 +---- qga/commands-posix.c | 9 +-------- qga/commands-win32.c | 3 +-- qga/commands.c | 1 + qga/guest-agent-command-state.c | 1 + qga/main.c | 5 +---- qga/service-win32.c | 3 +-- qga/vss-win32.c | 2 +- 9 files changed, 9 insertions(+), 27 deletions(-) diff --git a/qga/channel-posix.c b/qga/channel-posix.c index 50d9dd3..7ad3c00 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -1,11 +1,6 @@ +#include "qemu/osdep.h" #include #include -#include -#include -#include -#include -#include -#include "qemu/osdep.h" #include "qemu/sockets.h" #include "qga/channel.h" diff --git a/qga/channel-win32.c b/qga/channel-win32.c index 0452b9f..bb59661 100644 --- a/qga/channel-win32.c +++ b/qga/channel-win32.c @@ -1,9 +1,6 @@ -#include -#include -#include +#include "qemu/osdep.h" #include #include -#include #include #include "qga/guest-agent-core.h" #include "qga/channel.h" diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 5f91275..9589b2d634 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -11,18 +11,11 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include -#include #include #include -#include -#include -#include #include -#include -#include -#include -#include #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" #include "qapi/qmp/qerror.h" diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 61ffbdf..cf0757c 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -11,11 +11,10 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include #include -#include -#include #include #include #include diff --git a/qga/commands.c b/qga/commands.c index 58568d8..5b56786 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" diff --git a/qga/guest-agent-command-state.c b/qga/guest-agent-command-state.c index 128c549..20b9b22 100644 --- a/qga/guest-agent-command-state.c +++ b/qga/guest-agent-command-state.c @@ -9,6 +9,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include #include "qga/guest-agent-core.h" diff --git a/qga/main.c b/qga/main.c index f83a97d..0a168e2 100644 --- a/qga/main.c +++ b/qga/main.c @@ -10,16 +10,13 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ -#include -#include -#include +#include "qemu/osdep.h" #include #include #include #ifndef _WIN32 #include #include -#include #endif #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" diff --git a/qga/service-win32.c b/qga/service-win32.c index aef41f0..7243758 100644 --- a/qga/service-win32.c +++ b/qga/service-win32.c @@ -10,8 +10,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ -#include -#include +#include "qemu/osdep.h" #include #include #include "qga/service-win32.h" diff --git a/qga/vss-win32.c b/qga/vss-win32.c index 2142b49..5182e3b 100644 --- a/qga/vss-win32.c +++ b/qga/vss-win32.c @@ -10,7 +10,7 @@ * See the COPYING file in the top-level directory. */ -#include +#include "qemu/osdep.h" #include #include "qga/guest-agent-core.h" #include "qga/vss-win32.h"