aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2017-07-21 08:50:47 -0500
committerEric Blake <eblake@redhat.com>2017-07-24 08:53:08 -0500
commitc2a3d7dad2e153668b5a004e4f8336da92c476e1 (patch)
tree48be9ee3339f524ba0b3cd749142c394da5787c7
parentbe3771338fbf6368c63cc6e3406ac1423e62c01a (diff)
downloadqemu-c2a3d7dad2e153668b5a004e4f8336da92c476e1.zip
qemu-c2a3d7dad2e153668b5a004e4f8336da92c476e1.tar.gz
qemu-c2a3d7dad2e153668b5a004e4f8336da92c476e1.tar.bz2
maint: Reorder include directives for qemu-{nbd, io}
HACKING recommends listing system includes right after osdep.h, and before any other in-project headers. Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <20170721135047.25005-3-eblake@redhat.com>
-rw-r--r--qemu-img.c3
-rw-r--r--qemu-nbd.c8
2 files changed, 6 insertions, 5 deletions
diff --git a/qemu-img.c b/qemu-img.c
index eb32b93..f4d5f0d 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 1086934..b8666bb 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