vz: remove drivername field from vzConn structure

No need to remember connection name and have corresponding
domain type to keep backward compatibility with former
'parallels' driver. It is enough to be able to accept 'parallels'
uri and domain types.

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

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index f8d908546045df4977c8952a70b61ef9d892e4aa..376611542f1c24e5909e323ae94ceebb97ce7b85 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -228,8 +228,6 @@ vzOpenDefault(virConnectPtr conn)
         goto err_free;
     }
 
-    privconn->drivername = conn->driver->name;
-
     if (prlsdkInit()) {
         VIR_DEBUG("%s", _("Can't initialize Parallels SDK"));
         goto err_free;

diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c
index fed48a5b406a1228c2cfbd24931fe3ae3bd63eae..64e469c6b2cc8ff52cb4662220dfab565a41d900 100644 (file)
--- a/src/vz/vz_utils.c
+++ b/src/vz/vz_utils.c
@@ -178,10 +178,7 @@ vzNewDomain(vzConnPtr privconn, char *name, const unsigned char *uuid)
     pdom->cache.stats = PRL_INVALID_HANDLE;
     pdom->cache.count = -1;
 
-    if (STREQ(privconn->drivername, "vz"))
-        def->virtType = VIR_DOMAIN_VIRT_VZ;
-    else
-        def->virtType = VIR_DOMAIN_VIRT_PARALLELS;
+    def->virtType = VIR_DOMAIN_VIRT_VZ;
 
     if (!(dom = virDomainObjListAdd(privconn->domains, def,
                                     privconn->xmlopt,

diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h
index f3738502cc6af065a757a57d4417bb28bbcdf314..b415b0ff25b079cbd70fb8bf1887a649cee38156 100644 (file)
--- a/src/vz/vz_utils.h
+++ b/src/vz/vz_utils.h
@@ -70,7 +70,6 @@ struct _vzConn {
     virCapsPtr caps;
     virDomainXMLOptionPtr xmlopt;
     virObjectEventStatePtr domainEventState;
-    const char *drivername;
     /* Immutable pointer, self-locking APIs */
     virConnectCloseCallbackDataPtr closeCallback;
     unsigned long vzVersion;