From nobody Sun Feb 8 20:12:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1583931438; cv=none; d=zohomail.com; s=zohoarc; b=k46FyqQ0qLllx/WH+eF0A6+K7AApbNoRSXFI07ByiwFBHuvNYMH3ysILoGlQ7EbzLV5k6wjei33UII16u7IP/GNYx1/dwsSCiKqC1FvXoEdmo6HRXVi+4lBRFUEaJwKvRsuTVgDmAQKnBjE8OTFGeMST7MVJ9F7+n8MWegd3T5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583931438; 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; bh=bCvnPTkRke83MN5op3UoifUuHHblNn11VB+TgSCp4Xw=; b=jiPgfG11+HY6uCtxDe8qVvSlyRhXpIE74sVmL/qxJYLEUhevso5rKnEzPJmJZ2Sq+tbCy/D1RGYkixis8W6VPuzJoubf6Qm4BO6fjYuB17aPokIyGAAHhV2g2Fnaw4gZMRpUQaWlHuNxqFnD5FhIkQxGlCulG7rT/UkMqRx89Ps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1583931438441252.00997313407015; Wed, 11 Mar 2020 05:57:18 -0700 (PDT) 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-273-jEh29RuvM9-5u5ATn61HmA-1; Wed, 11 Mar 2020 08:57:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A96D1085933; Wed, 11 Mar 2020 12:57:09 +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 F3D2E60FC2; Wed, 11 Mar 2020 12:57:08 +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 AEE0286A21; Wed, 11 Mar 2020 12:57:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02BCv6lb009495 for ; Wed, 11 Mar 2020 08:57:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4D745C54A; Wed, 11 Mar 2020 12:57:06 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58A045C3FD; Wed, 11 Mar 2020 12:57:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583931437; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bCvnPTkRke83MN5op3UoifUuHHblNn11VB+TgSCp4Xw=; b=S3GwA1gH/hnaaXs4NK9wMCcy1P2aWU+BCXLL3vFDxzHPciThATu4iHYSJRVaNyPKEQLIu3 O+npDQf4H5+2QfR3XJ5xCYkLKmUqS1V53zwsCwECJRnYqE8h+RORO8Qs4vDWVQ4YEkdzCa tGwpJ098eOorHmI+l48Tb0juXRIMT84= X-MC-Unique: jEh29RuvM9-5u5ATn61HmA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 15/19] qemuBlockJobDiskNewCommit: Propagate 'disabledBitmapsBase' Date: Wed, 11 Mar 2020 13:56:00 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.79 on 10.5.11.12 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" Add an argument to qemuBlockJobDiskNewCommit to propagate the list of disabled bitmaps into the job data structure. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_blockjob.c | 2 ++ src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_driver.c | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index e894e1634d..63f1cc79c3 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -285,6 +285,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, virStorageSourcePtr topparent, virStorageSourcePtr top, virStorageSourcePtr base, + char ***disabledBitmapsBase, bool delete_imgs, unsigned int jobflags) { @@ -310,6 +311,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, job->data.commit.top =3D top; job->data.commit.base =3D base; job->data.commit.deleteCommittedImages =3D delete_imgs; + job->data.commit.disabledBitmapsBase =3D g_steal_pointer(disabledBitma= psBase); job->jobflags =3D jobflags; if (qemuBlockJobRegister(job, vm, disk, true) < 0) diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index e2e28ca4d3..9264c70217 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -187,6 +187,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, virStorageSourcePtr topparent, virStorageSourcePtr top, virStorageSourcePtr base, + char ***disabledBitmapsBase, bool delete_imgs, unsigned int jobflags); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d3eb2171ef..31c0f2dd91 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18556,7 +18556,7 @@ qemuDomainBlockCommit(virDomainPtr dom, } if (!(job =3D qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSourc= e, - baseSource, + baseSource, NULL, flags & VIR_DOMAIN_BLOCK_COMMIT_= DELETE, flags))) goto endjob; --=20 2.24.1