[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 2/2] maint: Reorder include directives for qemu-{nbd,
From: |
Eric Blake |
Subject: |
[Qemu-block] [PULL 2/2] maint: Reorder include directives for qemu-{nbd, io} |
Date: |
Mon, 24 Jul 2017 09:01:49 -0500 |
HACKING recommends listing system includes right after osdep.h,
and before any other in-project headers.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
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 <getopt.h>
+
#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 <getopt.h>
#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 <getopt.h>
+#include <libgen.h>
+#include <pthread.h>
+
#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 <getopt.h>
-#include <libgen.h>
-#include <pthread.h>
-
#define SOCKET_PATH "/var/lock/qemu-nbd-%s"
#define QEMU_NBD_OPT_CACHE 256
#define QEMU_NBD_OPT_AIO 257
--
2.13.3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-block] [PULL 2/2] maint: Reorder include directives for qemu-{nbd, io},
Eric Blake <=