From 0135324b9fc0f4b803fcd1464c83ce458ca1b1e0 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 20 Dec 2013 15:08:06 +0100
Subject: [PATCH] qemu: Fix job usage in qemuDomainBlockCopy
Every API that is going to begin a job should do that before fetching
data from vm->def.
(cherry picked from commit ff5f30b6bfa317f2a4c33f69289baf4e887eb048)
Conflicts:
src/qemu/qemu_driver.c - context
---
src/qemu/qemu_driver.c | 66 ++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 35 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 432f251294..c346118618 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13192,7 +13192,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path,
virDomainObjPtr vm;
qemuDomainObjPrivatePtr priv;
char *device = NULL;
- virDomainDiskDefPtr disk;
+ virDomainDiskDefPtr disk = NULL;
int ret = -1;
int idx;
struct stat st;
@@ -13208,39 +13208,6 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path,
goto cleanup;
priv = vm->privateData;
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)
goto cleanup;
@@ -13250,6 +13217,35 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path,
_("domain is not running"));
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)
goto endjob;
@@ -13341,7 +13337,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path,
endjob:
if (need_unlink && unlink(dest))
VIR_WARN("unable to unlink just-created %s", dest);
- if (ret < 0)
+ if (ret < 0 && disk)
disk->mirrorFormat = VIR_STORAGE_FILE_NONE;
VIR_FREE(mirror);
if (qemuDomainObjEndJob(driver, vm) == 0) {