From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7174C7618B for ; Thu, 25 Jul 2019 09:19:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B9C9F2190F for ; Thu, 25 Jul 2019 09:19:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B9C9F2190F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqZuY-0000Ro-HD for qemu-devel@archiver.kernel.org; Thu, 25 Jul 2019 05:19:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35741) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqZtz-0007SI-61 for qemu-devel@nongnu.org; Thu, 25 Jul 2019 05:19:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqZtx-00044S-Uu for qemu-devel@nongnu.org; Thu, 25 Jul 2019 05:19:07 -0400 Received: from relay.sw.ru ([185.231.240.75]:44212) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqZtx-00041a-MP; Thu, 25 Jul 2019 05:19:05 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hqZtt-0001bs-4e; Thu, 25 Jul 2019 12:19:01 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 25 Jul 2019 12:18:51 +0300 Message-Id: <20190725091900.30542-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v3 for-4.1? 0/9] qcow2-bitmaps: rewrite reopening logic 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: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi all! Bitmaps reopening is buggy, we may easily produce broken incremental backup if we do temporary snapshot. Let's fix it! v3: 02: John's events_wait already merged in, so my 02 from v2 is not needed. Instead, add two simple logging wrappers here 03: rebase on 02 - use new wrappers, move to 260 05: add John's r-b 06: improve function docs [John], add John's r-b v2: 01: new 02-03: test: splat into two patches, some wording improvements and event_wait improved 04: add John's r-b 05: new 06-09: fixes: changed, splat, use patch 01 Vladimir Sementsov-Ogievskiy (9): block: add .bdrv_need_rw_file_child_during_reopen_rw handler iotests.py: add event_wait_log and events_wait_log helpers iotests: add test 260 to check bitmap life after snapshot + commit block/qcow2-bitmap: get rid of bdrv_has_changed_persistent_bitmaps block/qcow2-bitmap: drop qcow2_reopen_bitmaps_rw_hint() block/qcow2-bitmap: do not remove bitmaps on reopen-ro block/qcow2-bitmap: fix and improve qcow2_reopen_bitmaps_rw block/qcow2-bitmap: fix reopening bitmaps to RW qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_prepare block/qcow2.h | 6 +- include/block/block_int.h | 8 +- include/block/dirty-bitmap.h | 1 - block.c | 163 +++++++++++++++++++++++++++------- block/dirty-bitmap.c | 12 --- block/qcow2-bitmap.c | 149 +++++++++++++++++++------------ block/qcow2.c | 9 +- tests/qemu-iotests/260 | 87 ++++++++++++++++++ tests/qemu-iotests/260.out | 52 +++++++++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 10 +++ 11 files changed, 384 insertions(+), 114 deletions(-) create mode 100755 tests/qemu-iotests/260 create mode 100644 tests/qemu-iotests/260.out -- 2.18.0