From c4d9dd8cf6492bb0f5595d958886bffe33148529 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Oct 2011 15:43:37 +0100 Subject: [PATCH] inspection: Return root devices sorted. (cherry picked from commit c46bedf925cd9c6c9a9cbaee115358fd1dffcbfe) --- src/inspect.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/inspect.c b/src/inspect.c index c51804d..ba3e5de 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -123,6 +123,15 @@ guestfs__inspect_os (guestfs_h *g) return ret; } +static int +compare_strings (const void *vp1, const void *vp2) +{ + const char *s1 = * (char * const *) vp1; + const char *s2 = * (char * const *) vp2; + + return strcmp (s1, s2); +} + char ** guestfs__inspect_get_roots (guestfs_h *g) { @@ -151,6 +160,8 @@ guestfs__inspect_get_roots (guestfs_h *g) } ret[count] = NULL; + qsort (ret, count, sizeof (char *), compare_strings); + return ret; } -- 1.8.3.1