Add "ubd" to the list of disk prefixes

virDiskNameToIndex has a list of disk name prefixes that it uses in the
process of finding the disk's index. This list is missing "ubd" which
is the disk prefix used for UML domains.

Signed-off-by: Soren Hansen <soren@linux2go.dk>

diff --git a/.mailmap b/.mailmap
index 652c5856fa8dfdcf6884a6b22f394bb5de007ac7..824df36e3325b5a75b6341e23a1e931d5a780c1d 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -13,3 +13,4 @@
 <jfehlig@novell.com> <jfehlig@linux-ypgk.site>
 <jclift@redhat.com> <justin@salasaga.org>
 <berrange@redhat.com> <dan@berrange.com>
+<soren@canonical.com> <soren@linux2go.dk>

diff --git a/src/util/util.c b/src/util/util.c
index 8f2a17e6f9923708fc512966d98a6c509e603f9d..c173e491d01dca63397a6049a3a4be776e1ed0b5 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -2367,7 +2367,7 @@ const char *virEnumToString(const char *const*types,
 int virDiskNameToIndex(const char *name) {
     const char *ptr = NULL;
     int idx = 0;
-    static char const* const drive_prefix[] = {"fd", "hd", "vd", "sd", "xvd"};
+    static char const* const drive_prefix[] = {"fd", "hd", "vd", "sd", "xvd", "ubd"};
     unsigned int i;
 
     for (i = 0; i < ARRAY_CARDINALITY(drive_prefix); i++) {