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>

diff --git a/qemu-img.c b/qemu-img.c
index eb32b93e904a664a9fa9a24711ea421dd125c4a1..f4d5f0d77d64436a33f0f02972d818ff1da6f7b5 100644 (file)
--- 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 1086934a95b8793275e325da2ed977c985a1fe2b..b8666bb57591915bc8bf99c7be09f88aa8fe8858 100644 (file)
--- 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