diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 1d852f51927e638c24ea9b3043c918f03215efa0..0a30107f38e6f57b6d169df08511d449a0f44000 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -1094,6 +1094,70 @@ parallelsDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags) return ret; } +static int parallelsDomainAttachDeviceFlags(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 = virDomainObjListFindByUUID(privconn->domains, dom->uuid); + if (privdom == NULL) { + parallelsDomNotFoundError(dom); + goto cleanup; + } + + if (!(flags & VIR_DOMAIN_AFFECT_CONFIG)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("device attach 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 = prlsdkAttachVolume(dom->conn, privdom, dev->data.disk); + if (ret) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("disk attach failed")); + goto cleanup; + } + break; + default: + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("device type '%s' cannot be detached"), + virDomainDeviceTypeToString(dev->type)); + break; + } + + ret = 0; + cleanup: + return ret; +} + static virHypervisorDriver parallelsDriver = { .name = "Parallels", .connectOpen = parallelsConnectOpen, /* 0.10.0 */ @@ -1128,6 +1192,7 @@ static virHypervisorDriver parallelsDriver = { .domainDefineXMLFlags = parallelsDomainDefineXMLFlags, /* 1.2.12 */ .domainUndefine = parallelsDomainUndefine, /* 1.2.10 */ .domainUndefineFlags = parallelsDomainUndefineFlags, /* 1.2.10 */ + .domainAttachDeviceFlags = parallelsDomainAttachDeviceFlags, /* 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 36ea7a8b169eb9b441e65a45bb8488d5f86ebb76..dcc0beca9dbb6db5fe29a53d8a1439b4f3ce4387 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -2969,6 +2969,33 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootD return ret; } +int +prlsdkAttachVolume(virConnectPtr conn, + virDomainObjPtr dom, + virDomainDiskDefPtr disk) +{ + int ret = -1; + parallelsConnPtr privconn = conn->privateData; + parallelsDomObjPtr privdom = dom->privateData; + PRL_HANDLE job = PRL_INVALID_HANDLE; + + job = PrlVm_BeginEdit(privdom->sdkdom); + if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + goto cleanup; + + ret = prlsdkAddDisk(privdom->sdkdom, disk, false); + 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 b084678e4747c2ad3b709ef6d54768af818b5768..00fa44d3d9cd4443d832b73b0fb42e5530dfadaf 100644 --- a/src/parallels/parallels_sdk.h +++ b/src/parallels/parallels_sdk.h @@ -60,3 +60,7 @@ int prlsdkUnregisterDomain(parallelsConnPtr privconn, virDomainObjPtr dom); int prlsdkDomainManagedSaveRemove(parallelsConnPtr privconn, virDomainObjPtr dom); +int +prlsdkAttachVolume(virConnectPtr conn, + virDomainObjPtr dom, + virDomainDiskDefPtr disk);