From patchwork Mon Jul 23 22:22:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 10541241 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FFD5157A for ; Mon, 23 Jul 2018 22:24:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 201CD284CE for ; Mon, 23 Jul 2018 22:24:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13A912851A; Mon, 23 Jul 2018 22:24:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BB3E6284CE for ; Mon, 23 Jul 2018 22:24:16 +0000 (UTC) Received: from localhost ([::1]:37133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhjFX-0003dl-Vk for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 Jul 2018 18:24:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhjDf-00026R-Rd for qemu-devel@nongnu.org; Mon, 23 Jul 2018 18:22:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhjDe-0007vs-TT for qemu-devel@nongnu.org; Mon, 23 Jul 2018 18:22:19 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46654 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fhjDY-0007np-Dj; Mon, 23 Jul 2018 18:22:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 37E9B402332F; Mon, 23 Jul 2018 22:22:11 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-177.bos.redhat.com [10.18.17.177]) by smtp.corp.redhat.com (Postfix) with ESMTP id B35AF2026D65; Mon, 23 Jul 2018 22:22:10 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 23 Jul 2018 18:22:03 -0400 Message-Id: <20180723222210.11077-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 23 Jul 2018 22:22:11 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 23 Jul 2018 22:22:11 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH for-3.0 0/7] fix persistent bitmaps migration logic X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , Juan Quintela , qemu-stable@nongnu.org, "Dr. David Alan Gilbert" , Stefan Hajnoczi , Max Reitz , John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This is an updated version of Vladimir's proposal for fixing the handling around migration and persistent dirty bitmaps. Patches 1, 4, 6, and 7 update the testing for this feature. Patch 2 touches up an error message. Patch 3 removes dead code. Patch 5 contains the real fix. v2: - Add a new patch 4 as a prerequisite for what's now patch 5 - Rework the fix to be (hopefully) cleaner, see patch 5 notes - Adjust error message in patch 2 (Eric) - Adjust test logic slightly (patches 6, 7) to deal with changes in patch 5. John Snow (2): iotests: 169: actually test block migration dirty-bitmaps: clean-up bitmaps loading and migration logic Vladimir Sementsov-Ogievskiy (5): iotests: 169: drop deprecated 'autoload' parameter block/qcow2: improve error message in qcow2_inactivate block/qcow2: drop dirty_bitmaps_loaded state variable iotests: improve 169 iotests: 169: add cases for source vm resuming block.c | 4 --- block/dirty-bitmap.c | 20 ------------ block/qcow2-bitmap.c | 16 +++++++++ block/qcow2.c | 26 ++++----------- block/qcow2.h | 1 - include/block/dirty-bitmap.h | 2 +- migration/block-dirty-bitmap.c | 11 ++++--- tests/qemu-iotests/169 | 74 ++++++++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/169.out | 4 +-- 9 files changed, 103 insertions(+), 55 deletions(-) Reviewed-by: Stefan Hajnoczi