From nobody Wed May 15 03:22:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1609858157; cv=none; d=zohomail.com; s=zohoarc; b=ZzycnzG1bZwYHW28ArNdz4+0PWvZoa4z4SelRdW7iYNMj9/f4WnERy8KRkPxPK4NN195S48KAhv7DuMa/gNA4QifiRF11Hett3FH7uGE9sOUUVck8AIgitYPkJtM6b77I4QrzY8UEWvWlGieQCAehJR4eZHOp9p85465Ixo29Jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609858157; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=1kE9NhXmVX/ovOhnqMrvRtQA9br434TMMrsQ1Kf4ACU=; b=NMTkDY3lR+NKy4pfy7KDz4OMmSEIvkUtaSXG0+aEY/M4V1AgUOtbLJ0SJn/VIvX1AfyCKNeCTZsBhX9udlT+wPTGi8MkGHVyNlY/TFRT4VbkF+1xTF1brhtmXf+8CUkauk2XN4cJiukuP88uGKJjiecNIlIiAcReDs2UdIYLn7k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1609858157420981.7451233931337; Tue, 5 Jan 2021 06:49:17 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-242-RmRBunaINXagTdB953OVOg-1; Tue, 05 Jan 2021 09:49:13 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B2691800D41; Tue, 5 Jan 2021 14:49:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 62AAA25274; Tue, 5 Jan 2021 14:49:07 +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 2CF3F180954D; Tue, 5 Jan 2021 14:49:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 105En5Bm015185 for ; Tue, 5 Jan 2021 09:49:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2A9002654A; Tue, 5 Jan 2021 14:49:05 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 847E725274 for ; Tue, 5 Jan 2021 14:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609858156; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1kE9NhXmVX/ovOhnqMrvRtQA9br434TMMrsQ1Kf4ACU=; b=BRtlSKNHwY1gWKmQx4I4Pyfu+sH9BgzEtBKjjdKsOBXOtzWlYnqoNn/weUCp/ku/BiN/pD FmVpVEMql6d7HZ1MaSZLPgmZ7G9yQ6bPsOZCpUiXwivUBXgPiSGCsOGBQv0NtF6zVXr9UA 1W6IT6tj/U/MArV5w8SlORlHFwrRctA= X-MC-Unique: RmRBunaINXagTdB953OVOg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] qemu: backup: Properly delete temporary bitmap after push-mode incremental backup Date: Tue, 5 Jan 2021 15:49:00 +0100 Message-Id: <75a0aea11b7d9c40cd4079c36c5aade4e47345e6.1609858140.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Refactor in 0316c28a453ac used incorrect source variable to initialize the variable which holds the name of the bitmap which needs to be deleted after the backup job finishes. This resulted into deleting the source bitmap of the backup rather than the temporary one. Use 'dd->incrementalBitmap' which holds the temporary bitmap name instead of 'dd->backupdisk->incremental' which holds the name of the source bitmap which is used by the backup. Fixes: 0316c28a453ac15f58c61f30359f66ab9a649884 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1908647 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_backup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index b2340eb1cf..c444f8aaba 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -235,7 +235,7 @@ qemuBackupDiskPrepareOneBitmaps(struct qemuBackupDiskDa= ta *dd, blockNamedNodeData) < 0) return -1; - dd->domdiskIncrementalBitmap =3D dd->backupdisk->incremental; + dd->domdiskIncrementalBitmap =3D dd->incrementalBitmap; } return 0; --=20 2.29.2