提交 ff5f30b6 编写于 作者: J Jiri Denemark

qemu: Fix job usage in qemuDomainBlockCopy

Every API that is going to begin a job should do that before fetching
data from vm->def.
上级 f93d2caa
...@@ -14435,7 +14435,7 @@ qemuDomainBlockCopy(virDomainObjPtr vm, ...@@ -14435,7 +14435,7 @@ qemuDomainBlockCopy(virDomainObjPtr vm,
virQEMUDriverPtr driver = conn->privateData; virQEMUDriverPtr driver = conn->privateData;
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;
...@@ -14450,29 +14450,32 @@ qemuDomainBlockCopy(virDomainObjPtr vm, ...@@ -14450,29 +14450,32 @@ qemuDomainBlockCopy(virDomainObjPtr vm,
priv = vm->privateData; priv = vm->privateData;
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain is not running")); _("domain is not running"));
goto cleanup; goto endjob;
} }
device = qemuDiskPathToAlias(vm, path, &idx); device = qemuDiskPathToAlias(vm, path, &idx);
if (!device) { if (!device) {
goto cleanup; goto endjob;
} }
disk = vm->def->disks[idx]; disk = vm->def->disks[idx];
if (disk->mirror) { if (disk->mirror) {
virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
_("disk '%s' already in active block copy job"), _("disk '%s' already in active block copy job"),
disk->dst); disk->dst);
goto cleanup; goto endjob;
} }
if (!(virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_MIRROR) && if (!(virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_MIRROR) &&
virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC))) { virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("block copy is not supported with this QEMU binary")); _("block copy is not supported with this QEMU binary"));
goto cleanup; goto endjob;
} }
if (vm->persistent) { if (vm->persistent) {
/* XXX if qemu ever lets us start a new domain with mirroring /* XXX if qemu ever lets us start a new domain with mirroring
...@@ -14481,17 +14484,9 @@ qemuDomainBlockCopy(virDomainObjPtr vm, ...@@ -14481,17 +14484,9 @@ qemuDomainBlockCopy(virDomainObjPtr vm,
* this on persistent domains. */ * this on persistent domains. */
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain is not transient")); _("domain is not transient"));
goto cleanup;
}
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
if (!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain is not running"));
goto endjob; goto endjob;
} }
if (qemuDomainDetermineDiskChain(driver, disk, false) < 0) if (qemuDomainDetermineDiskChain(driver, disk, false) < 0)
goto endjob; goto endjob;
...@@ -14581,7 +14576,7 @@ qemuDomainBlockCopy(virDomainObjPtr vm, ...@@ -14581,7 +14576,7 @@ qemuDomainBlockCopy(virDomainObjPtr vm,
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)) if (!qemuDomainObjEndJob(driver, vm))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册