blockcommit: update error messages related to block jobs

A future patch will add two-phase block commit jobs; as the
mechanism for managing them is similar to managing a block copy
job, existing errors should be made generic enough to occur
for either job type.

* src/conf/domain_conf.c (virDomainHasDiskMirror): Update
comment.
* src/qemu/qemu_driver.c (qemuDomainDefineXML)
(qemuDomainSnapshotCreateXML, qemuDomainRevertToSnapshot)
(qemuDomainBlockJobImpl, qemuDomainBlockCopy): Update error
message.
* src/qemu/qemu_hotplug.c (qemuDomainDetachDiskDevice): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ff2d447345c5b16e3292cbc130e192d7aee6cf1b..be81dbec8522d814a45d73e9866833473fd3bb23 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10379,7 +10379,7 @@ virDomainDiskRemoveByName(virDomainDefPtr def, const char *name)
 }
 
 /* Return true if VM has at least one disk involved in a current block
- * copy job (that is, with a <mirror> element in the disk xml).  */
+ * copy/commit job (that is, with a <mirror> element in the disk xml).  */
 bool
 virDomainHasDiskMirror(virDomainObjPtr vm)
 {

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b5f7b3ce42c955db88cf407a556b19e0857d2bdd..7bf20207238c42b4393dd1da06a5d93af3ff896f 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6261,7 +6261,7 @@ static virDomainPtr qemuDomainDefineXML(virConnectPtr conn, const char *xml)
     def = NULL;
     if (virDomainHasDiskMirror(vm)) {
         virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, "%s",
-                       _("domain has active block copy job"));
+                       _("domain has active block job"));
         virDomainObjAssignDef(vm, NULL, false, NULL);
         goto cleanup;
     }
@@ -13465,7 +13465,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
     }
     if (virDomainHasDiskMirror(vm)) {
         virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, "%s",
-                       _("domain has active block copy job"));
+                       _("domain has active block job"));
         goto cleanup;
     }
 
@@ -14075,7 +14075,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
 
     if (virDomainHasDiskMirror(vm)) {
         virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, "%s",
-                       _("domain has active block copy job"));
+                       _("domain has active block job"));
         goto cleanup;
     }
 
@@ -15075,7 +15075,7 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm,
 
     if (mode == BLOCK_JOB_PULL && disk->mirror) {
         virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
-                       _("disk '%s' already in active block copy job"),
+                       _("disk '%s' already in active block job"),
                        disk->dst);
         goto endjob;
     }
@@ -15283,7 +15283,7 @@ qemuDomainBlockCopy(virDomainObjPtr vm,
     disk = vm->def->disks[idx];
     if (disk->mirror) {
         virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
-                       _("disk '%s' already in active block copy job"),
+                       _("disk '%s' already in active block job"),
                        disk->dst);
         goto endjob;
     }

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index cd43dd5ecb252cd22235bf1c736d415e1de2b5c0..728905518711173406cf47116fb0e08818ba83fa 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2986,7 +2986,7 @@ qemuDomainDetachDiskDevice(virQEMUDriverPtr driver,
 
     if (detach->mirror) {
         virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
-                       _("disk '%s' is in an active block copy job"),
+                       _("disk '%s' is in an active block job"),
                        detach->dst);
         goto cleanup;
     }