External/libvirt
1
0
Fork 0
Code

vz: Adapt to driver rename

Browse Source 
In the e6d180f07fb06 commit the parallels driver was renamed to vz.
However, there was a commit merged later, which was sent to the list
before the rename. The other commit is 6de12b026b73. Fix all the
missing renames.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-06-25 09:36:41 +02:00
parent cb005533ab
commit 84d0286ef0
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/vz/vz_sdk.c
View File

@ -2885,14 +2885,20 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom,
return ret; return ret;
} }
static void prlsdkDelNet(vzConnPtr privconn, virDomainNetDefPtr net) static int
prlsdkDelNet(vzConnPtr privconn, virDomainNetDefPtr net)
{ {
int ret = -1;
PRL_RESULT pret; PRL_RESULT pret;
PRL_HANDLE vnet = PRL_INVALID_HANDLE; PRL_HANDLE vnet = PRL_INVALID_HANDLE;
PRL_HANDLE job = PRL_INVALID_HANDLE; PRL_HANDLE job = PRL_INVALID_HANDLE;
if (net->type != VIR_DOMAIN_NET_TYPE_BRIDGE) if (net->type != VIR_DOMAIN_NET_TYPE_BRIDGE) {
return; virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("unplugging network device of type %s is not supported"),
virDomainNetTypeToString(net->type));
return ret;
}
pret = PrlVirtNet_Create(&vnet); pret = PrlVirtNet_Create(&vnet);
prlsdkCheckRetGoto(pret, cleanup); prlsdkCheckRetGoto(pret, cleanup);
@ -2904,16 +2910,19 @@ static void prlsdkDelNet(vzConnPtr privconn, virDomainNetDefPtr net)
if (PRL_FAILED(pret = waitJob(job))) if (PRL_FAILED(pret = waitJob(job)))
goto cleanup; goto cleanup;
ret = 0;
cleanup: cleanup:
PrlHandle_Free(vnet); PrlHandle_Free(vnet);
return ret;
} }
int prlsdkAttachNet(virDomainObjPtr dom, int prlsdkAttachNet(virDomainObjPtr dom,
parallelsConnPtr privconn, vzConnPtr privconn,
virDomainNetDefPtr net) virDomainNetDefPtr net)
{ {
int ret = -1; int ret = -1;
parallelsDomObjPtr privdom = dom->privateData; vzDomObjPtr privdom = dom->privateData;
PRL_HANDLE job = PRL_INVALID_HANDLE; PRL_HANDLE job = PRL_INVALID_HANDLE;
if (!IS_CT(dom->def)) { if (!IS_CT(dom->def)) {
@ -2998,11 +3007,11 @@ static int prlsdkDelNetAdapter(PRL_HANDLE sdkdom, int idx)
} }
int prlsdkDetachNet(virDomainObjPtr dom, int prlsdkDetachNet(virDomainObjPtr dom,
parallelsConnPtr privconn, vzConnPtr privconn,
virDomainNetDefPtr net) virDomainNetDefPtr net)
{ {
int ret = -1, idx = -1; int ret = -1, idx = -1;
parallelsDomObjPtr privdom = dom->privateData; vzDomObjPtr privdom = dom->privateData;
PRL_HANDLE job = PRL_INVALID_HANDLE; PRL_HANDLE job = PRL_INVALID_HANDLE;
if (!IS_CT(dom->def)) { if (!IS_CT(dom->def)) {

4
src/vz/vz_sdk.h
View File

@ -67,6 +67,6 @@ prlsdkDetachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk);
int int
prlsdkGetBlockStats(virDomainObjPtr dom, virDomainDiskDefPtr disk, virDomainBlockStatsPtr stats); prlsdkGetBlockStats(virDomainObjPtr dom, virDomainDiskDefPtr disk, virDomainBlockStatsPtr stats);
int int
prlsdkAttachNet(virDomainObjPtr dom, parallelsConnPtr privconn, virDomainNetDefPtr net); prlsdkAttachNet(virDomainObjPtr dom, vzConnPtr privconn, virDomainNetDefPtr net);
int int
prlsdkDetachNet(virDomainObjPtr dom, parallelsConnPtr privconn, virDomainNetDefPtr net); prlsdkDetachNet(virDomainObjPtr dom, vzConnPtr privconn, virDomainNetDefPtr net);