[libvirt] [PATCH for 5.7.0 2/3] qemu_blockjob: Print image path on failed security metadata move too

Michal Privoznik mprivozn at redhat.com
Fri Aug 30 13:19:07 UTC 2019


When a block job is completed, the security image metadata are
moved to the new image. If this fails an warning is printed, but
the message contains only domain name and lacks image paths. Put
them both into the warning message.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_blockjob.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index c77a129bfc..80302fb139 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -646,8 +646,10 @@ qemuBlockJobEventProcessLegacyCompleted(virQEMUDriverPtr driver,
         virDomainLockImageDetach(driver->lockManager, vm, disk->src);
 
         /* Move secret driver metadata */
-        if (qemuSecurityMoveImageMetadata(driver, vm, disk->src, disk->mirror) < 0)
-            VIR_WARN("Unable to move disk metadata on vm %s", vm->def->name);
+        if (qemuSecurityMoveImageMetadata(driver, vm, disk->src, disk->mirror) < 0) {
+            VIR_WARN("Unable to move disk metadata on vm %s from %s to %s",
+                     vm->def->name, NULLSTR(disk->src->path), NULLSTR(disk->mirror->path));
+        }
 
         virObjectUnref(disk->src);
         disk->src = disk->mirror;
-- 
2.21.0




More information about the libvir-list mailing list