From: Maxim Nestratov <mnestratov@parallels.com>
Date: Tue, 26 May 2015 17:12:00 +0000 (+0300)
Subject: parallels: accept vz as a driver uri and name
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f4e51d9e411c1ca1aedfc75742d400c0ebc2032a;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

parallels: accept vz as a driver uri and name

If 'parallels:///system' uri is specified then connection is made to
'Parallels' driver and domain type will be VIR_DOMAIN_VIRT_PARALLELS.
In case of 'vz:///system' connection is established to 'vz' driver
and domain type will be VIR_DOMAIN_VIRT_VZ.

Signed-off-by: Maxim Nestratov <mnestratov@parallels.com>
---

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index b2ce2ef49..3db5872c4 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -296,7 +296,17 @@ parallelsConnectOpen(virConnectPtr conn,
     if (!conn->uri)
         return VIR_DRV_OPEN_DECLINED;
 
-    if (!conn->uri->scheme || STRNEQ(conn->uri->scheme, "parallels"))
+    if (!conn->uri->scheme)
+        return VIR_DRV_OPEN_DECLINED;
+
+    if (STRNEQ(conn->uri->scheme, "vz") &&
+        STRNEQ(conn->uri->scheme, "parallels"))
+        return VIR_DRV_OPEN_DECLINED;
+
+    if (STREQ(conn->uri->scheme, "vz") && STRNEQ(conn->driver->name, "vz"))
+        return VIR_DRV_OPEN_DECLINED;
+
+    if (STREQ(conn->uri->scheme, "parallels") && STRNEQ(conn->driver->name, "Parallels"))
         return VIR_DRV_OPEN_DECLINED;
 
     /* Remote driver should handle these. */
diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index fb98041d8..895c70679 100644
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -334,7 +334,8 @@ parallelsNetworkOpen(virConnectPtr conn,
 
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
-    if (STRNEQ(conn->driver->name, "Parallels"))
+    if (STRNEQ(conn->driver->name, "vz") &&
+        STRNEQ(conn->driver->name, "Parallels"))
         return VIR_DRV_OPEN_DECLINED;
 
     if (!(privconn->networks = virNetworkObjListNew()))
diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c
index 4091124ba..3dcc44da1 100644
--- a/src/parallels/parallels_storage.c
+++ b/src/parallels/parallels_storage.c
@@ -470,7 +470,8 @@ parallelsStorageOpen(virConnectPtr conn,
     virStorageDriverStatePtr storageState;
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
 
-    if (STRNEQ(conn->driver->name, "Parallels"))
+    if (STRNEQ(conn->driver->name, "vz") &&
+        STRNEQ(conn->driver->name, "Parallels"))
         return VIR_DRV_OPEN_DECLINED;
 
     if (VIR_ALLOC(storageState) < 0)