External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Fix job usage in qemuDomainBlockCopy

Browse Source 
Every API that is going to begin a job should do that before fetching
data from vm->def.

(cherry picked from commit ff5f30b6bf)

Conflicts:
	src/qemu/qemu_driver.c - context
This commit is contained in:
Jiri Denemark 2013-12-20 15:08:06 +01:00 committed by Eric Blake
parent 8bdc22d281
commit 3e41a461b3
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/qemu/qemu_driver.c
View File

@ -13495,7 +13495,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path,
virDomainObjPtr vm; virDomainObjPtr vm;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
char *device = NULL; char *device = NULL;
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk = NULL;
int ret = -1; int ret = -1;
int idx; int idx;
struct stat st; struct stat st;
@ -13511,39 +13511,6 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path,
goto cleanup; goto cleanup;
priv = vm->privateData; priv = vm->privateData;
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain is not running"));
goto cleanup;
}
device = qemuDiskPathToAlias(vm, path, &idx);
if (!device) {
goto cleanup;
}
disk = vm->def->disks[idx];
if (disk->mirror) {
virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
_("disk '%s' already in active block copy job"),
disk->dst);
goto cleanup;
}
if (!(virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_MIRROR) &&
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("block copy is not supported with this QEMU binary"));
goto cleanup;
}
if (vm->persistent) {
/* XXX if qemu ever lets us start a new domain with mirroring
* already active, we can relax this; but for now, the risk of
* 'managedsave' due to libvirt-guests means we can't risk
* this on persistent domains. */
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain is not transient"));
goto cleanup;
}
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
@ -13553,6 +13520,35 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path,
_("domain is not running")); _("domain is not running"));
goto endjob; goto endjob;
} }
device = qemuDiskPathToAlias(vm, path, &idx);
if (!device) {
goto endjob;
}
disk = vm->def->disks[idx];
if (disk->mirror) {
virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
_("disk '%s' already in active block copy job"),
disk->dst);
goto endjob;
}
if (!(virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_MIRROR) &&
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("block copy is not supported with this QEMU binary"));
goto endjob;
}
if (vm->persistent) {
/* XXX if qemu ever lets us start a new domain with mirroring
* already active, we can relax this; but for now, the risk of
* 'managedsave' due to libvirt-guests means we can't risk
* this on persistent domains. */
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain is not transient"));
goto endjob;
}
if (qemuDomainDetermineDiskChain(driver, disk, false) < 0) if (qemuDomainDetermineDiskChain(driver, disk, false) < 0)
goto endjob; goto endjob;
@ -13642,7 +13638,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path,
endjob: endjob:
if (need_unlink && unlink(dest)) if (need_unlink && unlink(dest))
VIR_WARN("unable to unlink just-created %s", dest); VIR_WARN("unable to unlink just-created %s", dest);
if (ret < 0) if (ret < 0 && disk)
disk->mirrorFormat = VIR_STORAGE_FILE_NONE; disk->mirrorFormat = VIR_STORAGE_FILE_NONE;
VIR_FREE(mirror); VIR_FREE(mirror);
if (qemuDomainObjEndJob(driver, vm) == 0) { if (qemuDomainObjEndJob(driver, vm) == 0) {