From nobody Tue Nov 26 19:49:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1567176982; cv=none; d=zoho.com; s=zohoarc; b=TrXkaqKg+FQZCvFEbJhoTO3boWzELEXXes/1l05lOjAjdjs0MoZUvACKdZ9UdaMbcMmQYDGcVa+qBrdOM1Iwclt+FxW9SfUzQ6BWen088iXxYf4CRlVWIS1QeHgRL1CZpfPpSCpYhDbzZ2r1RSodPP2Eut81BNpOhOR5GckWSUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567176982; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=HbLekBdJIXjLePA6h1hc0oKxx1IGxQwYB2ri5mAbxAU=; b=nn21tJy8rrAI4y0fpRFJ5e86tWoJvVYlMcPAL4ROum9vSqhSn8d7OJOi/pTReGXcQxiqqem/o7CpNjpckFz3a7mE91SzFOSTqm4gl9M9nVmBzKoKd4jbpAc1o6ucOIW4is4F/VXTZRmMfUVstTL0tg/Pkmo1NFf5pNTLBneXsDA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567176982216486.2413146525927; Fri, 30 Aug 2019 07:56:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CF7E8C0546FB; Fri, 30 Aug 2019 14:56:20 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A735D5D772; Fri, 30 Aug 2019 14:56:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 10F1A24F31; Fri, 30 Aug 2019 14:56:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7UEuGkv024496 for ; Fri, 30 Aug 2019 10:56:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8FD296012C; Fri, 30 Aug 2019 14:56:16 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 197A8600F8 for ; Fri, 30 Aug 2019 14:56:15 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 30 Aug 2019 16:56:09 +0200 Message-Id: <2739663219b4952bb846a67361d7409433903ef7.1567176843.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH for 5.7.0 v2 2/3] qemu_blockjob: Print image path on failed security metadata move too X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 30 Aug 2019 14:56:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" 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(virQEMUDriverP= tr driver, virDomainLockImageDetach(driver->lockManager, vm, disk->src); =20 /* Move secret driver metadata */ - if (qemuSecurityMoveImageMetadata(driver, vm, disk->src, disk->mir= ror) < 0) - VIR_WARN("Unable to move disk metadata on vm %s", vm->def->nam= e); + if (qemuSecurityMoveImageMetadata(driver, vm, disk->src, disk->mir= ror) < 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); + } =20 virObjectUnref(disk->src); disk->src =3D disk->mirror; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list