On 04/23/2015 09:37 PM, Maxim Nestratov wrote:

Signed-off-by: Maxim Nestratov <mnestratov@parallels.com> --- src/parallels/parallels_sdk.c | 65 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index d54f894..5e6e21c 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -2844,6 +2844,25 @@ static void prlsdkDelNet(parallelsConnPtr privconn, virDomainNetDefPtr net) PrlHandle_Free(vnet); }

+static int prlsdkDelDisk(PRL_HANDLE sdkdom, int idx) +{ + int ret = -1; + PRL_RESULT pret; + PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE; + + pret = PrlVmCfg_GetHardDisk(sdkdom, idx, &sdkdisk); + prlsdkCheckRetGoto(pret, cleanup); + + pret = PrlVmDev_Remove(sdkdisk); + prlsdkCheckRetGoto(pret, cleanup); + + ret = 0; + + cleanup: + PrlHandle_Free(sdkdisk); + return ret; +} + static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootDisk) { PRL_RESULT pret; @@ -3042,6 +3061,52 @@ prlsdkAttachVolume(virConnectPtr conn, }

static int +prlsdkGetDiskIndex(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk) +{ + int idx = -1; + char *buf = NULL; + PRL_UINT32 buflen = 0; + PRL_RESULT pret; + PRL_UINT32 hddCount; + PRL_UINT32 i; + PRL_HANDLE hdd = PRL_INVALID_HANDLE; + + pret = PrlVmCfg_GetHardDisksCount(sdkdom, &hddCount); + prlsdkCheckRetGoto(pret, cleanup); + + for (i = 0; i < hddCount; ++i) { + + pret = PrlVmCfg_GetHardDisk(sdkdom, i, &hdd); + prlsdkCheckRetGoto(pret, cleanup); + + pret = PrlVmDev_GetFriendlyName(hdd, 0, &buflen); + prlsdkCheckRetGoto(pret, cleanup); + + if (VIR_ALLOC_N(buf, buflen) < 0) + goto cleanup; + + pret = PrlVmDev_GetFriendlyName(hdd, buf, &buflen); + prlsdkCheckRetGoto(pret, cleanup); + + if (STRNEQ(disk->src->path, buf)) { + + PrlHandle_Free(hdd); + hdd = PRL_INVALID_HANDLE; + VIR_FREE(buf); + continue; + } + + VIR_FREE(buf); + idx = i; + break; + } + + cleanup: + PrlHandle_Free(hdd); + return idx; +} + +static int prlsdkAddFS(PRL_HANDLE sdkdom, virDomainFSDefPtr fs) { PRL_RESULT pret; Looks good to me, ACKed and pushed, thanks!

On 04/23/2015 09:37 PM, Maxim Nestratov wrote:

New functions utilize previosly added prlsdkDelDisk and prlsdkGetDiskIndex Signed-off-by: Maxim Nestratov <mnestratov@parallels.com> --- src/parallels/parallels_driver.c | 71 ++++++++++++++++++++++++++++++++++++++ src/parallels/parallels_sdk.c | 30 ++++++++++++++++ src/parallels/parallels_sdk.h | 3 ++ 3 files changed, 104 insertions(+), 0 deletions(-)

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 07f1311..b667e02 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -1098,6 +1098,75 @@ static int parallelsDomainAttachDevice(virDomainPtr dom, const char *xml) VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_LIVE); }

+static int parallelsDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, + unsigned int flags) +{ + int ret = -1; + parallelsConnPtr privconn = dom->conn->privateData; + virDomainDeviceDefPtr dev = NULL; + virDomainObjPtr privdom = NULL; + bool domactive = false; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + privdom = parallelsDomObjFromDomain(dom); + if (privdom == NULL) + return -1; + + if (!(flags & VIR_DOMAIN_AFFECT_CONFIG)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("device detach needs VIR_DOMAIN_AFFECT_CONFIG " + "flag to be set")); + goto cleanup; + } + + domactive = virDomainObjIsActive(privdom); + if (!domactive && (flags & VIR_DOMAIN_AFFECT_LIVE)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot do live update a device on " + "inactive domain")); + goto cleanup; + } + if (domactive && !(flags & VIR_DOMAIN_AFFECT_LIVE)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Updates on a running domain need " + "VIR_DOMAIN_AFFECT_LIVE flag")); + } + + dev = virDomainDeviceDefParse(xml, privdom->def, privconn->caps, + privconn->xmlopt, VIR_DOMAIN_XML_INACTIVE); + if (dev == NULL) + goto cleanup; + + switch (dev->type) { + case VIR_DOMAIN_DEVICE_DISK: + ret = prlsdkDetachVolume(dom->conn, privdom, dev->data.disk); + if (ret) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("disk detach failed")); + goto cleanup; + } + break; + default: + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("device type '%s' cannot be detached"), + virDomainDeviceTypeToString(dev->type)); + break; + } + + ret = 0; + cleanup: + virObjectUnlock(privdom); + return ret; +} + +static int parallelsDomainDetachDevice(virDomainPtr dom, const char *xml) +{ + return parallelsDomainDetachDeviceFlags(dom, xml, + VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_LIVE); +} + static virHypervisorDriver parallelsDriver = { .name = "Parallels", .connectOpen = parallelsConnectOpen, /* 0.10.0 */ @@ -1134,6 +1203,8 @@ static virHypervisorDriver parallelsDriver = { .domainUndefineFlags = parallelsDomainUndefineFlags, /* 1.2.10 */ .domainAttachDevice = parallelsDomainAttachDevice, /* 1.2.15 */ .domainAttachDeviceFlags = parallelsDomainAttachDeviceFlags, /* 1.2.15 */ + .domainDetachDevice = parallelsDomainDetachDevice, /* 1.2.15 */ + .domainDetachDeviceFlags = parallelsDomainDetachDeviceFlags, /* 1.2.15 */ .domainIsActive = parallelsDomainIsActive, /* 1.2.10 */ .connectDomainEventRegisterAny = parallelsConnectDomainEventRegisterAny, /* 1.2.10 */ .connectDomainEventDeregisterAny = parallelsConnectDomainEventDeregisterAny, /* 1.2.10 */ diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index 5e6e21c..94274a2 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -3106,6 +3106,36 @@ prlsdkGetDiskIndex(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk) return idx; }

+int prlsdkDetachVolume(virConnectPtr conn, + virDomainObjPtr dom, + virDomainDiskDefPtr disk) +{ + int ret = -1, idx; + parallelsConnPtr privconn = conn->privateData; + parallelsDomObjPtr privdom = dom->privateData; + PRL_HANDLE job = PRL_INVALID_HANDLE; + + idx = prlsdkGetDiskIndex(privdom->sdkdom, disk); + if (idx < 0) + goto cleanup; + + job = PrlVm_BeginEdit(privdom->sdkdom); + if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + goto cleanup; + + ret = prlsdkDelDisk(privdom->sdkdom, idx); + if (ret == 0) { + job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE); + if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) { + ret = -1; + goto cleanup; + } + } + + cleanup: + return ret; +} + static int prlsdkAddFS(PRL_HANDLE sdkdom, virDomainFSDefPtr fs) { diff --git a/src/parallels/parallels_sdk.h b/src/parallels/parallels_sdk.h index 00fa44d..3ad46c3 100644 --- a/src/parallels/parallels_sdk.h +++ b/src/parallels/parallels_sdk.h @@ -64,3 +64,6 @@ int prlsdkAttachVolume(virConnectPtr conn, virDomainObjPtr dom, virDomainDiskDefPtr disk); +int prlsdkDetachVolume(virConnectPtr conn, + virDomainObjPtr dom, + virDomainDiskDefPtr disk);

Rebased, ACKed and pushed.