From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMz4P-0004Jx-K4 for qemu-devel@nongnu.org; Thu, 28 Aug 2014 08:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMz4J-0008Ca-8h for qemu-devel@nongnu.org; Thu, 28 Aug 2014 08:44:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMz4J-0008CW-0e for qemu-devel@nongnu.org; Thu, 28 Aug 2014 08:44:47 -0400 From: Stefan Hajnoczi Date: Thu, 28 Aug 2014 13:44:26 +0100 Message-Id: <1409229867-16775-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1409229867-16775-1-git-send-email-stefanha@redhat.com> References: <1409229867-16775-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 5/6] block: sort formats alphabetically in bdrv_iterate_format() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi Format names are best consumed in alphabetical order. This makes human-readable output easy to produce. bdrv_iterate_format() already has an array of format strings. Sort them before invoking the iteration callback. Signed-off-by: Stefan Hajnoczi --- block.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index e9380f6..1df13ac 100644 --- a/block.c +++ b/block.c @@ -3744,11 +3744,17 @@ const char *bdrv_get_format_name(BlockDriverState *bs) return bs->drv ? bs->drv->format_name : NULL; } +static int qsort_strcmp(const void *a, const void *b) +{ + return strcmp(a, b); +} + void bdrv_iterate_format(void (*it)(void *opaque, const char *name), void *opaque) { BlockDriver *drv; int count = 0; + int i; const char **formats = NULL; QLIST_FOREACH(drv, &bdrv_drivers, list) { @@ -3762,10 +3768,16 @@ void bdrv_iterate_format(void (*it)(void *opaque, const char *name), if (!found) { formats = g_renew(const char *, formats, count + 1); formats[count++] = drv->format_name; - it(opaque, drv->format_name); } } } + + qsort(formats, count, sizeof(formats[0]), qsort_strcmp); + + for (i = 0; i < count; i++) { + it(opaque, formats[i]); + } + g_free(formats); } -- 1.9.3