External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 14:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Add support for networked disks for block commit

Browse Source 
Now that we are able to select images from the backing chain via indexed
access we should also convert possible network sources to
qemu-compatible strings before passing them to qemu.
This commit is contained in:
Peter Krempa 2014-04-28 15:39:19 +02:00
parent 37183e5db8
commit 60244b56af
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/qemu/qemu_driver.c
View File

@ -15505,9 +15505,13 @@ qemuDomainBlockCommit(virDomainPtr dom,
unsigned int baseIndex = 0; unsigned int baseIndex = 0;
const char *top_parent = NULL; const char *top_parent = NULL;
bool clean_access = false; bool clean_access = false;
char *topPath = NULL;
char *basePath = NULL;
char *backingPath = NULL;
/* XXX Add support for COMMIT_ACTIVE, COMMIT_DELETE */ /* XXX Add support for COMMIT_ACTIVE, COMMIT_DELETE */
virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW, -1); virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW |
VIR_DOMAIN_BLOCK_COMMIT_RELATIVE, -1);
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
goto cleanup; goto cleanup;
@ -15617,6 +15621,31 @@ qemuDomainBlockCommit(virDomainPtr dom,
VIR_DISK_CHAIN_READ_WRITE) < 0)) VIR_DISK_CHAIN_READ_WRITE) < 0))
goto endjob; goto endjob;
if (qemuGetDriveSourceString(topSource, NULL, &topPath) < 0)
goto endjob;
if (qemuGetDriveSourceString(baseSource, NULL, &basePath) < 0)
goto endjob;
if (flags & VIR_DOMAIN_BLOCK_COMMIT_RELATIVE &&
topSource != disk->src) {
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHANGE_BACKING_FILE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("this qemu doesn't support relative blockpull"));
goto endjob;
}
if (virStorageFileGetRelativeBackingPath(topSource, baseSource,
&backingPath) < 0)
goto endjob;
if (!backingPath) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("can't keep relative backing relationship"));
goto endjob;
}
}
/* Start the commit operation. Pass the user's original spelling, /* Start the commit operation. Pass the user's original spelling,
* if any, through to qemu, since qemu may behave differently * if any, through to qemu, since qemu may behave differently
* depending on whether the input was specified as relative or * depending on whether the input was specified as relative or
@ -15624,9 +15653,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
* thing if the user specified a relative name). */ * thing if the user specified a relative name). */
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
ret = qemuMonitorBlockCommit(priv->mon, device, ret = qemuMonitorBlockCommit(priv->mon, device,
top && !topIndex ? top : topSource->path, topPath, basePath, backingPath,
base && !baseIndex ? base : baseSource->path,
NULL,
bandwidth); bandwidth);
qemuDomainObjExitMonitor(driver, vm); qemuDomainObjExitMonitor(driver, vm);
@ -15644,6 +15671,9 @@ qemuDomainBlockCommit(virDomainPtr dom,
vm = NULL; vm = NULL;
cleanup: cleanup:
VIR_FREE(topPath);
VIR_FREE(basePath);
VIR_FREE(backingPath);
VIR_FREE(device); VIR_FREE(device);
if (vm) if (vm)
virObjectUnlock(vm); virObjectUnlock(vm);