From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 10 Aug 2010 11:46:46 +0000 (+0200)
Subject: Add "ubd" to the list of disk prefixes
X-Git-Tag: v0.8.4~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92e43e6d026b06d79ae156de511df1f024f4bf42;p=thirdparty%2Flibvirt.git

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 652c5856fa..824df36e33 100644
--- 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 8f2a17e6f9..c173e491d0 100644
--- 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++) {