From 7f99d8a739c01a280ca0c173ecd6051a92f0c897 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 30 Aug 2019 15:07:48 +0200 Subject: [PATCH] qemu_blockjob: Print image path on failed security metadata move too 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 ACKed-by: Peter Krempa --- src/qemu/qemu_blockjob.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index c77a129bfc..1b22689e0c 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -646,8 +646,14 @@ 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 (disk target %s)", + vm->def->name, + NULLSTR(disk->src->path), + NULLSTR(disk->mirror->path), + disk->dst); + } virObjectUnref(disk->src); disk->src = disk->mirror;