From patchwork Mon Jul 24 14:01:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 792814 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xGNTY3myHz9s4q for ; Tue, 25 Jul 2017 00:06:41 +1000 (AEST) Received: from localhost ([::1]:55056 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZe0N-0006WF-5A for incoming@patchwork.ozlabs.org; Mon, 24 Jul 2017 10:06:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZdvw-0003fc-HO for qemu-devel@nongnu.org; Mon, 24 Jul 2017 10:02:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZdvu-0006lN-0m for qemu-devel@nongnu.org; Mon, 24 Jul 2017 10:02:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dZdvo-0006Z5-R2; Mon, 24 Jul 2017 10:01:56 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6933C00160D; Mon, 24 Jul 2017 14:01:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B6933C00160D Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eblake@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B6933C00160D Received: from red.redhat.com (ovpn-121-48.rdu2.redhat.com [10.10.121.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F6686FDD4; Mon, 24 Jul 2017 14:01:53 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 09:01:49 -0500 Message-Id: <20170724140149.1933-3-eblake@redhat.com> In-Reply-To: <20170724140149.1933-1-eblake@redhat.com> References: <20170724140149.1933-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 24 Jul 2017 14:01:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] maint: Reorder include directives for qemu-{nbd, io} X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Paolo Bonzini , "open list:Block layer core" , Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" HACKING recommends listing system includes right after osdep.h, and before any other in-project headers. Signed-off-by: Eric Blake Message-Id: <20170721135047.25005-3-eblake@redhat.com> --- qemu-img.c | 3 ++- qemu-nbd.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index eb32b93e90..f4d5f0d77d 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -22,6 +22,8 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" +#include + #include "qemu-version.h" #include "qapi/error.h" #include "qapi/util.h" @@ -43,7 +45,6 @@ #include "block/qapi.h" #include "crypto/init.h" #include "trace/control.h" -#include #define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \ "\n" QEMU_COPYRIGHT "\n" diff --git a/qemu-nbd.c b/qemu-nbd.c index 1086934a95..b8666bb575 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -17,6 +17,10 @@ */ #include "qemu/osdep.h" +#include +#include +#include + #include "qapi/error.h" #include "qemu-common.h" #include "qemu/cutils.h" @@ -38,10 +42,6 @@ #include "trace/control.h" #include "qemu-version.h" -#include -#include -#include - #define SOCKET_PATH "/var/lock/qemu-nbd-%s" #define QEMU_NBD_OPT_CACHE 256 #define QEMU_NBD_OPT_AIO 257