提交 f376069f 编写于 作者: M Maxim Nestratov

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: NMaxim Nestratov <mnestratov@virtuozzo.com>
上级 419aaf23
...@@ -228,8 +228,6 @@ vzOpenDefault(virConnectPtr conn) ...@@ -228,8 +228,6 @@ vzOpenDefault(virConnectPtr conn)
goto err_free; goto err_free;
} }
privconn->drivername = conn->driver->name;
if (prlsdkInit()) { if (prlsdkInit()) {
VIR_DEBUG("%s", _("Can't initialize Parallels SDK")); VIR_DEBUG("%s", _("Can't initialize Parallels SDK"));
goto err_free; goto err_free;
......
...@@ -178,10 +178,7 @@ vzNewDomain(vzConnPtr privconn, char *name, const unsigned char *uuid) ...@@ -178,10 +178,7 @@ vzNewDomain(vzConnPtr privconn, char *name, const unsigned char *uuid)
pdom->cache.stats = PRL_INVALID_HANDLE; pdom->cache.stats = PRL_INVALID_HANDLE;
pdom->cache.count = -1; pdom->cache.count = -1;
if (STREQ(privconn->drivername, "vz")) def->virtType = VIR_DOMAIN_VIRT_VZ;
def->virtType = VIR_DOMAIN_VIRT_VZ;
else
def->virtType = VIR_DOMAIN_VIRT_PARALLELS;
if (!(dom = virDomainObjListAdd(privconn->domains, def, if (!(dom = virDomainObjListAdd(privconn->domains, def,
privconn->xmlopt, privconn->xmlopt,
......
...@@ -70,7 +70,6 @@ struct _vzConn { ...@@ -70,7 +70,6 @@ struct _vzConn {
virCapsPtr caps; virCapsPtr caps;
virDomainXMLOptionPtr xmlopt; virDomainXMLOptionPtr xmlopt;
virObjectEventStatePtr domainEventState; virObjectEventStatePtr domainEventState;
const char *drivername;
/* Immutable pointer, self-locking APIs */ /* Immutable pointer, self-locking APIs */
virConnectCloseCallbackDataPtr closeCallback; virConnectCloseCallbackDataPtr closeCallback;
unsigned long vzVersion; unsigned long vzVersion;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册