[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message |
Date: |
Fri, 9 May 2014 21:03:23 +0200 |
From: Mike Day <address@hidden>
The help message for qemu-img lists the supported block formats, of
which there are 27 as of version 2.0.50. The formats are printed in
the order of their driver's position in a linked list, which appears
random. This patch prints the formats in sorted order, making it
easier to read and to find a specific format in the list.
[Added suggestions from Fam Zheng <address@hidden> to declare variables
at the top of the scope in help() and to omit explicit cast for void*
opaque.
--Stefan]
Signed-off-by: Mike Day <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qemu-img.c | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 96f4463..317bc6c 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -32,6 +32,7 @@
#include "block/block_int.h"
#include "block/qapi.h"
#include <getopt.h>
+#include <glib.h>
#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION \
", Copyright (c) 2004-2008 Fabrice Bellard\n"
@@ -55,9 +56,25 @@ typedef enum OutputFormat {
#define BDRV_O_FLAGS BDRV_O_CACHE_WB
#define BDRV_DEFAULT_CACHE "writeback"
-static void format_print(void *opaque, const char *name)
+static gint compare_data(gconstpointer a, gconstpointer b, gpointer user)
{
- printf(" %s", name);
+ return g_strcmp0(a, b);
+}
+
+static void print_format(gpointer data, gpointer user)
+{
+ printf(" %s", (char *)data);
+}
+
+static void add_format_to_seq(void *opaque, const char *fmt_name)
+{
+ GSequence *seq = opaque;
+
+ if (!g_sequence_lookup(seq, (gpointer)fmt_name,
+ compare_data, NULL)) {
+ g_sequence_insert_sorted(seq, (gpointer)fmt_name,
+ compare_data, NULL);
+ }
}
static void QEMU_NORETURN GCC_FMT_ATTR(1, 2) error_exit(const char *fmt, ...)
@@ -142,10 +159,15 @@ static void QEMU_NORETURN help(void)
" '-f' first image format\n"
" '-F' second image format\n"
" '-s' run in Strict mode - fail on different image size or sector
allocation\n";
+ GSequence *seq;
printf("%s\nSupported formats:", help_msg);
- bdrv_iterate_format(format_print, NULL);
+ seq = g_sequence_new(NULL);
+ bdrv_iterate_format(add_format_to_seq, seq);
+ g_sequence_foreach(seq, print_format, NULL);
printf("\n");
+ g_sequence_free(seq);
+
exit(EXIT_SUCCESS);
}
--
1.9.0
- [Qemu-devel] [PULL 00/17] Block patches, Stefan Hajnoczi, 2014/05/09
- [Qemu-devel] [PULL 02/17] iotests: Use configured python, Stefan Hajnoczi, 2014/05/09
- [Qemu-devel] [PULL 01/17] qcow2: Fix alloc_clusters_noref() overflow detection, Stefan Hajnoczi, 2014/05/09
- [Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message, Cornelia Huck, 2014/05/13
- Re: [Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message, Mike Day, 2014/05/13
- Re: [Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message, Stefan Hajnoczi, 2014/05/14
- Re: [Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message, Mike Day, 2014/05/14
- Re: [Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message, Fam Zheng, 2014/05/14
- Re: [Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message, Jeff Cody, 2014/05/14
- Re: [Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message, Jeff Cody, 2014/05/14
- Re: [Qemu-devel] [PULL 03/17] qemu-img: sort block formats in help message, Mike Day, 2014/05/14
[Qemu-devel] [PULL 04/17] block/nfs: Check for NULL server part, Stefan Hajnoczi, 2014/05/09
[Qemu-devel] [PULL 06/17] qemu-img: Convert by cluster size if target is compressed, Stefan Hajnoczi, 2014/05/09