From nobody Tue Dec 16 11:04:41 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590089374; cv=none; d=zohomail.com; s=zohoarc; b=CdHZe1EbuEYYvmzeh1aqSwrYAedvb9dEqLZERDLFAevmZZTCMDkmNNypL9gYUvgW+gJgLhs6zoCNw2zvixkP+Hbnr7tf+vb14DJUUs3URMK+/YbtFTaubGWS24OOeCF3mwXDQkeelpakwvWnzO5IcKqxWuVM9AUET1FPHBXN6oc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590089374; h=Content-Type:Content-Transfer-Encoding:Cc: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=xw4kopJyl+ZCFYPm7tv46M8mDWU/mQxbD28+mxjHPME=; b=kcqIkLgSRmIS4JR5n9L+MsJ9ljpzHBo4UXqMd8+hCzZOP+9QSXQNIzvoEdEcH9nbFysfdH5ktMXjZ+vg8ez0eZo9G+GJUhZyR+4Oe7iJuUr/Uc6U3pj33pdVSlYKF47O/CQYQTPybpVgY1pOlxFLqPkEFJt4SNpk0LFntC4yFtA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590089374589942.0064959349186; Thu, 21 May 2020 12:29:34 -0700 (PDT) Received: from localhost ([::1]:36786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbqsn-00051I-5O for importer@patchew.org; Thu, 21 May 2020 15:29:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbqlQ-0005JR-2Z for qemu-devel@nongnu.org; Thu, 21 May 2020 15:21:56 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:50537 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jbqlO-0001iZ-E9 for qemu-devel@nongnu.org; Thu, 21 May 2020 15:21:55 -0400 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-147-OFiNOKjWOdKIrFn5nvFy2Q-1; Thu, 21 May 2020 15:21:45 -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 6C767835B41; Thu, 21 May 2020 19:21:44 +0000 (UTC) Received: from blue.redhat.com (ovpn-112-88.phx2.redhat.com [10.3.112.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3EB060C87; Thu, 21 May 2020 19:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590088913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xw4kopJyl+ZCFYPm7tv46M8mDWU/mQxbD28+mxjHPME=; b=LcqDktr24A68Q6d5+rsUv8IoCSuuHex0qKq5Tup9WEjtRu5gagXDSvDm07Y4PiHRSvYT/g R0w2KNwQIeWlrDC7LpAOD6btNYDyyjSq9SRNzFGnicvZyipBJ+P9t/Pc4TmZtyjxhtOe+X trKc96bBz0cuIGYKzQETE6PgQ8pe6og= X-MC-Unique: OFiNOKjWOdKIrFn5nvFy2Q-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH v6 3/5] qemu-img: Factor out code for merging bitmaps Date: Thu, 21 May 2020 14:21:35 -0500 Message-Id: <20200521192137.1120211-4-eblake@redhat.com> In-Reply-To: <20200521192137.1120211-1-eblake@redhat.com> References: <20200521192137.1120211-1-eblake@redhat.com> MIME-Version: 1.0 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 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/21 04:44:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, nsoffer@redhat.com, vsementsov@virtuozzo.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The next patch will add another client that wants to merge dirty bitmaps; it will be easier to refactor the code to construct the QAPI struct correctly into a helper function. Signed-off-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- qemu-img.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index b2311bd3f6b4..0778d8f56614 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1638,6 +1638,24 @@ out4: return ret; } +/* Convenience wrapper around qmp_block_dirty_bitmap_merge */ +static void do_dirty_bitmap_merge(const char *dst_node, const char *dst_na= me, + const char *src_node, const char *src_na= me, + Error **errp) +{ + BlockDirtyBitmapMergeSource *merge_src; + BlockDirtyBitmapMergeSourceList *list; + + merge_src =3D g_new0(BlockDirtyBitmapMergeSource, 1); + merge_src->type =3D QTYPE_QDICT; + merge_src->u.external.node =3D g_strdup(src_node); + merge_src->u.external.name =3D g_strdup(src_name); + list =3D g_new0(BlockDirtyBitmapMergeSourceList, 1); + list->value =3D merge_src; + qmp_block_dirty_bitmap_merge(dst_node, dst_name, list, errp); + qapi_free_BlockDirtyBitmapMergeSourceList(list); +} + enum ImgConvertBlockStatus { BLK_DATA, BLK_ZERO, @@ -4714,21 +4732,11 @@ static int img_bitmap(int argc, char **argv) qmp_block_dirty_bitmap_disable(bs->node_name, bitmap, &err); op =3D "disable"; break; - case BITMAP_MERGE: { - BlockDirtyBitmapMergeSource *merge_src; - BlockDirtyBitmapMergeSourceList *list; - - merge_src =3D g_new0(BlockDirtyBitmapMergeSource, 1); - merge_src->type =3D QTYPE_QDICT; - merge_src->u.external.node =3D g_strdup(src_bs->node_name); - merge_src->u.external.name =3D g_strdup(act->src); - list =3D g_new0(BlockDirtyBitmapMergeSourceList, 1); - list->value =3D merge_src; - qmp_block_dirty_bitmap_merge(bs->node_name, bitmap, list, &err= ); - qapi_free_BlockDirtyBitmapMergeSourceList(list); + case BITMAP_MERGE: + do_dirty_bitmap_merge(bs->node_name, bitmap, src_bs->node_name, + act->src, &err); op =3D "merge"; break; - } default: g_assert_not_reached(); } --=20 2.26.2