shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

Update Parallels driver to always use privateData

Browse Source 
Since the secondary drivers are only active when the primary
driver is also the Parallels driver, there is no need to use the
different type specific privateData fields. The object that was
being stored in the storagePrivateData can easily be kept in the
parallelsConn struct instead.
This commit is contained in:
Daniel P. Berrange 2014-10-23 14:33:11 +01:00
parent cd49008697
commit cfacca18fa
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/parallels/parallels_network.c
View File

@ -328,8 +328,6 @@ parallelsNetworkOpen(virConnectPtr conn,
if (STRNEQ(conn->driver->name, "Parallels"))
return VIR_DRV_OPEN_DECLINED;
conn->networkPrivateData = conn->privateData;
if (parallelsLoadNetworks(conn->privateData) < 0)
return VIR_DRV_OPEN_DECLINED;

12
src/parallels/parallels_storage.c
View File

@ -72,8 +72,8 @@ parallelsStorageClose(virConnectPtr conn)
{
parallelsConnPtr privconn = conn->privateData;
virStorageDriverStatePtr storageState = conn->storagePrivateData;
conn->storagePrivateData = NULL;
virStorageDriverStatePtr storageState = conn->privateData->storageState;
conn->privateData->storageState = NULL;
parallelsStorageLock(storageState);
virStoragePoolObjListFree(&privconn->pools);
@ -189,7 +189,7 @@ parallelsPoolCreateByPath(virConnectPtr conn, const char *path)
if (!(pool = virStoragePoolObjAssignDef(pools, def)))
goto error;
if (virStoragePoolObjSaveDef(conn->storagePrivateData, pool, def) < 0) {
if (virStoragePoolObjSaveDef(conn->privateData->storageState, pool, def) < 0) {
virStoragePoolObjRemove(pools, pool);
goto error;
}
@ -404,7 +404,7 @@ parallelsPoolsAdd(virDomainObjPtr dom,
static int parallelsLoadPools(virConnectPtr conn)
{
parallelsConnPtr privconn = conn->privateData;
virStorageDriverStatePtr storageState = conn->storagePrivateData;
virStorageDriverStatePtr storageState = conn->privateData->storageState;
char *base = NULL;
size_t i;
@ -475,7 +475,7 @@ parallelsStorageOpen(virConnectPtr conn,
return VIR_DRV_OPEN_ERROR;
}
conn->storagePrivateData = storageState;
conn->privateData->storageState = storageState;
parallelsStorageLock(storageState);
if (parallelsLoadPools(conn))
@ -728,7 +728,7 @@ parallelsStoragePoolDefineXML(virConnectPtr conn,
if (!(pool = virStoragePoolObjAssignDef(&privconn->pools, def)))
goto cleanup;
if (virStoragePoolObjSaveDef(conn->storagePrivateData, pool, def) < 0) {
if (virStoragePoolObjSaveDef(conn->privateData->storageState, pool, def) < 0) {
virStoragePoolObjRemove(&privconn->pools, pool);
def = NULL;
goto cleanup;

1
src/parallels/parallels_utils.h
View File

@ -49,6 +49,7 @@ struct _parallelsConn {
virCapsPtr caps;
virDomainXMLOptionPtr xmlopt;
virObjectEventStatePtr domainEventState;
virStorageDriverStatePtr storageState;
};
typedef struct _parallelsConn parallelsConn;