From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Tue, 27 Sep 2011 11:11:14 +0000 (+0200)
Subject: hyperv: Report an error for acceptable URI schemes with a transport
X-Git-Tag: v0.9.7-rc1~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b706b2703513760c45a408c5fca143d515fabcf;p=thirdparty%2Flibvirt.git

hyperv: Report an error for acceptable URI schemes with a transport

Before, URIs such as hyperv+ssh:// have been declined by the Hyper-V
driver resulting in the remote driver trying to connect to an
non-existing libvirtd.

Now such URIs trigger an error in the yper-V driver suggesting to
try again without the transport part in the scheme.
---

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index b022fee7f2..39b55f8330 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -69,6 +69,7 @@ static virDrvOpenStatus
 hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags)
 {
     virDrvOpenStatus result = VIR_DRV_OPEN_ERROR;
+    char *plus;
     hypervPrivate *priv = NULL;
     char *username = NULL;
     char *password = NULL;
@@ -77,12 +78,30 @@ hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags)
 
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
-    /* Decline if the URI is NULL or the scheme is not hyperv */
-    if (conn->uri == NULL || conn->uri->scheme == NULL ||
-        STRCASENEQ(conn->uri->scheme, "hyperv")) {
+    /* Decline if the URI is NULL or the scheme is NULL */
+    if (conn->uri == NULL || conn->uri->scheme == NULL) {
         return VIR_DRV_OPEN_DECLINED;
     }
 
+    /* Decline if the scheme is not hyperv */
+    plus = strchr(conn->uri->scheme, '+');
+
+    if (plus == NULL) {
+        if (STRCASENEQ(conn->uri->scheme, "hyperv")) {
+            return VIR_DRV_OPEN_DECLINED;
+        }
+    } else {
+        if (plus - conn->uri->scheme != 6 ||
+            STRCASENEQLEN(conn->uri->scheme, "hyperv", 6)) {
+            return VIR_DRV_OPEN_DECLINED;
+        }
+
+        HYPERV_ERROR(VIR_ERR_INVALID_ARG,
+                     _("Transport '%s' in URI scheme is not supported, try again "
+                       "without the transport part"), plus + 1);
+        return VIR_DRV_OPEN_ERROR;
+    }
+
     /* Require server part */
     if (conn->uri->server == NULL) {
         HYPERV_ERROR(VIR_ERR_INVALID_ARG, "%s",