OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Revert "qemu-img: sort block formats in help message"

Browse Source 
This reverts commit 1a443c1b8b and the
later commit 395071a763.

GSequence was introduced in glib 2.14.  RHEL 5 fails to compile since it
uses glib 2.12.3.

Now that bdrv_iterate_format() invokes the iteration callback in sorted
order these commits are unnecessary.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
This commit is contained in:
Stefan Hajnoczi 2014-08-27 12:08:56 +01:00
parent ada4240103
commit 00c6d403a3
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qemu-img.c
View File

@ -32,7 +32,6 @@
#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"
@ -56,22 +55,9 @@ typedef enum OutputFormat {
#define BDRV_O_FLAGS BDRV_O_CACHE_WB
#define BDRV_DEFAULT_CACHE "writeback"
static gint compare_data(gconstpointer a, gconstpointer b, gpointer user)
static void format_print(void *opaque, const char *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;
g_sequence_insert_sorted(seq, (gpointer)fmt_name,
compare_data, NULL);
printf(" %s", name);
}
static void QEMU_NORETURN GCC_FMT_ATTR(1, 2) error_exit(const char *fmt, ...)
@ -157,15 +143,10 @@ 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);
seq = g_sequence_new(NULL);
bdrv_iterate_format(add_format_to_seq, seq);
g_sequence_foreach(seq, print_format, NULL);
bdrv_iterate_format(format_print, NULL);
printf("\n");
g_sequence_free(seq);
exit(EXIT_SUCCESS);
}