From patchwork Fri Dec 14 23:15:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 10731799 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 1997D746 for ; Fri, 14 Dec 2018 23:17:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6DCC287EA for ; Fri, 14 Dec 2018 23:17:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6ACB2D682; Fri, 14 Dec 2018 23:17:26 +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 36801287EA for ; Fri, 14 Dec 2018 23:17:25 +0000 (UTC) Received: from localhost ([::1]:35933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXwhw-00024U-MO for patchwork-qemu-devel@patchwork.kernel.org; Fri, 14 Dec 2018 18:17:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXwgN-0000p7-Jk for qemu-devel@nongnu.org; Fri, 14 Dec 2018 18:15:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXwgL-0002d0-Hx for qemu-devel@nongnu.org; Fri, 14 Dec 2018 18:15:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40060) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXwfx-0001KY-HJ; Fri, 14 Dec 2018 18:15:22 -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 mx1.redhat.com (Postfix) with ESMTPS id 2D88A99D38; Fri, 14 Dec 2018 23:15:19 +0000 (UTC) Received: from probe.redhat.com (ovpn-122-54.rdu2.redhat.com [10.10.122.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id E925219C65; Fri, 14 Dec 2018 23:15:13 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Fri, 14 Dec 2018 18:15:05 -0500 Message-Id: <20181214231512.5295-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 14 Dec 2018 23:15:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 0/7] bitmaps: remove x- prefix from QMP api 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 , vsementsov@virtuozzo.com, Markus Armbruster , 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 Touch up a few last things and remove the x- prefix. V3: - Reworked qmp_log to pretty-print the outgoing command, too [Vladimir] - Modified test to log only bitmap information [Vladimir] - Test disable/enable transaction toggle [Eric] Note that the filter I added is now unused, but I think we will want it and it's small enough, so I'm going to check it in anyway. If you disagree, I'll just drop the patch instead. --js John Snow (7): blockdev: abort transactions in reverse order blockdev: n-ary bitmap merge block: remove 'x' prefix from experimental bitmap APIs iotests.py: don't abort if IMGKEYSECRET is undefined iotests: add filter_generated_node_ids iotests: allow pretty-print for qmp_log iotests: add iotest 236 for testing bitmap merge blockdev.c | 96 +++++++++------- qapi/block-core.json | 56 +++++----- qapi/transaction.json | 12 +- tests/qemu-iotests/223 | 4 +- tests/qemu-iotests/236 | 124 +++++++++++++++++++++ tests/qemu-iotests/236.out | 200 ++++++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 22 +++- 8 files changed, 436 insertions(+), 79 deletions(-) create mode 100755 tests/qemu-iotests/236 create mode 100644 tests/qemu-iotests/236.out