Update Hyper-V driver to always use privateData

Since the secondary drivers are only active when the primary
driver is also the Hyper-V driver, there is no need to use the
different type specific privateData fields.
This commit is contained in:
Daniel P. Berrange 2014-10-23 14:33:11 +01:00
parent e84666c576
commit 63c3c5399b
6 changed files with 6 additions and 30 deletions

View File

@ -44,18 +44,14 @@ hypervNodeDeviceOpen(virConnectPtr conn,
return VIR_DRV_OPEN_DECLINED; return VIR_DRV_OPEN_DECLINED;
} }
conn->nodeDevicePrivateData = conn->privateData;
return VIR_DRV_OPEN_SUCCESS; return VIR_DRV_OPEN_SUCCESS;
} }
static int static int
hypervNodeDeviceClose(virConnectPtr conn) hypervNodeDeviceClose(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
conn->nodeDevicePrivateData = NULL;
return 0; return 0;
} }

View File

@ -44,18 +44,14 @@ hypervInterfaceOpen(virConnectPtr conn,
return VIR_DRV_OPEN_DECLINED; return VIR_DRV_OPEN_DECLINED;
} }
conn->interfacePrivateData = conn->privateData;
return VIR_DRV_OPEN_SUCCESS; return VIR_DRV_OPEN_SUCCESS;
} }
static int static int
hypervInterfaceClose(virConnectPtr conn) hypervInterfaceClose(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
conn->interfacePrivateData = NULL;
return 0; return 0;
} }

View File

@ -44,18 +44,14 @@ hypervNetworkOpen(virConnectPtr conn,
return VIR_DRV_OPEN_DECLINED; return VIR_DRV_OPEN_DECLINED;
} }
conn->networkPrivateData = conn->privateData;
return VIR_DRV_OPEN_SUCCESS; return VIR_DRV_OPEN_SUCCESS;
} }
static int static int
hypervNetworkClose(virConnectPtr conn) hypervNetworkClose(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
conn->networkPrivateData = NULL;
return 0; return 0;
} }

View File

@ -44,18 +44,14 @@ hypervNWFilterOpen(virConnectPtr conn,
return VIR_DRV_OPEN_DECLINED; return VIR_DRV_OPEN_DECLINED;
} }
conn->nwfilterPrivateData = conn->privateData;
return VIR_DRV_OPEN_SUCCESS; return VIR_DRV_OPEN_SUCCESS;
} }
static int static int
hypervNWFilterClose(virConnectPtr conn) hypervNWFilterClose(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
conn->nwfilterPrivateData = NULL;
return 0; return 0;
} }

View File

@ -44,18 +44,14 @@ hypervSecretOpen(virConnectPtr conn,
return VIR_DRV_OPEN_DECLINED; return VIR_DRV_OPEN_DECLINED;
} }
conn->secretPrivateData = conn->privateData;
return VIR_DRV_OPEN_SUCCESS; return VIR_DRV_OPEN_SUCCESS;
} }
static int static int
hypervSecretClose(virConnectPtr conn) hypervSecretClose(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
conn->secretPrivateData = NULL;
return 0; return 0;
} }

View File

@ -44,18 +44,14 @@ hypervStorageOpen(virConnectPtr conn,
return VIR_DRV_OPEN_DECLINED; return VIR_DRV_OPEN_DECLINED;
} }
conn->storagePrivateData = conn->privateData;
return VIR_DRV_OPEN_SUCCESS; return VIR_DRV_OPEN_SUCCESS;
} }
static int static int
hypervStorageClose(virConnectPtr conn) hypervStorageClose(virConnectPtr conn ATTRIBUTE_UNUSED)
{ {
conn->storagePrivateData = NULL;
return 0; return 0;
} }