From patchwork Wed Mar 22 06:07:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandre DERUMIER X-Patchwork-Id: 9638133 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 989CC601E9 for ; Wed, 22 Mar 2017 06:08:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 875FF27B81 for ; Wed, 22 Mar 2017 06:08:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7ADBA27F60; Wed, 22 Mar 2017 06:08:29 +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=-6.9 required=2.0 tests=BAYES_00,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 4A37227B81 for ; Wed, 22 Mar 2017 06:08:27 +0000 (UTC) Received: from localhost ([::1]:49072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqZRa-0007gA-C3 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 22 Mar 2017 02:08:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqZR6-0007g4-5q for qemu-devel@nongnu.org; Wed, 22 Mar 2017 02:07:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqZR1-0004ld-Rm for qemu-devel@nongnu.org; Wed, 22 Mar 2017 02:07:56 -0400 Received: from mailpro.odiso.net ([89.248.211.110]:33618) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cqZR1-0004kq-IR for qemu-devel@nongnu.org; Wed, 22 Mar 2017 02:07:51 -0400 Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 70801174F21D; Wed, 22 Mar 2017 07:07:09 +0100 (CET) Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id IXB3oMrDlbWy; Wed, 22 Mar 2017 07:07:09 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 5373E174F21F; Wed, 22 Mar 2017 07:07:09 +0100 (CET) X-Virus-Scanned: amavisd-new at mailpro.odiso.com Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id LXzz9espuWyO; Wed, 22 Mar 2017 07:07:09 +0100 (CET) Received: from mailpro.odiso.net (mailpro.odiso.net [10.1.31.111]) by mailpro.odiso.net (Postfix) with ESMTP id 3A1CA174F21E; Wed, 22 Mar 2017 07:07:09 +0100 (CET) Date: Wed, 22 Mar 2017 07:07:09 +0100 (CET) From: Alexandre DERUMIER To: Markus Armbruster Message-ID: <1694034280.9874888.1490162829201.JavaMail.zimbra@oxygem.tv> In-Reply-To: <1490115473-24839-1-git-send-email-armbru@redhat.com> References: <1490115473-24839-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 X-Mailer: Zimbra 8.7.0_GA_1659 (ZimbraWebClient - GC57 (Linux)/8.7.0_GA_1659) Thread-Topic: block: Declare blockdev-add and blockdev-del supported Thread-Index: 96QiTBfwOQj905E3qqrnRE4RwhzqGQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 89.248.211.110 Subject: Re: [Qemu-devel] [PATCH for-2.9] block: Declare blockdev-add and blockdev-del supported 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 , pkrempa@redhat.com, qemu-devel , mreitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Pretty awesome news ! Congrat ! So, can we update the wiki changelog ? http://wiki.qemu-project.org/ChangeLog/2.9 "QMP command blockdev-add is still a work in progress. It doesn't support all block drivers, it lacks a matching blockdev-del, and more. It might change incompatibly." ----- Mail original ----- De: "Markus Armbruster" À: "qemu-devel" Cc: "Kevin Wolf" , pkrempa@redhat.com, "mreitz" Envoyé: Mardi 21 Mars 2017 17:57:53 Objet: [Qemu-devel] [PATCH for-2.9] block: Declare blockdev-add and blockdev-del supported It's been a long journey, but here we are. x-blockdev-remove-medium, x-blockdev-insert-medium and x-blockdev-change need a bit more work, so leave them alone for now. Signed-off-by: Markus Armbruster --- blockdev.c | 4 ++-- qapi/block-core.json | 14 +++++--------- tests/qemu-iotests/139 | 8 ++++---- tests/qemu-iotests/141 | 4 ++-- tests/qemu-iotests/147 | 2 +- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/blockdev.c b/blockdev.c index c5b2c2c..040c152 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2835,7 +2835,7 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict) bs = bdrv_find_node(id); if (bs) { - qmp_x_blockdev_del(id, &local_err); + qmp_blockdev_del(id, &local_err); if (local_err) { error_report_err(local_err); } @@ -3900,7 +3900,7 @@ fail: visit_free(v); } -void qmp_x_blockdev_del(const char *node_name, Error **errp) +void qmp_blockdev_del(const char *node_name, Error **errp) { AioContext *aio_context; BlockDriverState *bs; diff --git a/qapi/block-core.json b/qapi/block-core.json index 0f132fc..5d913d4 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2907,11 +2907,7 @@ # BlockBackend will be created; otherwise, @node-name is mandatory at the top # level and no BlockBackend will be created. # -# Note: This command is still a work in progress. It doesn't support all -# block drivers among other things. Stay away from it unless you want -# to help with its development. -# -# Since: 1.7 +# Since: 2.9 # # Example: # @@ -2957,7 +2953,7 @@ { 'command': 'blockdev-add', 'data': 'BlockdevOptions', 'boxed': true } ## -# @x-blockdev-del: +# @blockdev-del: # # Deletes a block device that has been added using blockdev-add. # The command will fail if the node is attached to a device or is @@ -2969,7 +2965,7 @@ # experimental. Stay away from it unless you want to help with its # development. # -# Since: 2.5 +# Since: 2.9 # # Example: # @@ -2985,13 +2981,13 @@ # } # <- { "return": {} } # -# -> { "execute": "x-blockdev-del", +# -> { "execute": "blockdev-del", # "arguments": { "node-name": "node0" } # } # <- { "return": {} } # ## -{ 'command': 'x-blockdev-del', 'data': { 'node-name': 'str' } } +{ 'command': 'blockdev-del', 'data': { 'node-name': 'str' } } ## # @blockdev-open-tray: diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139 index 6d98e4f..175d8f0 100644 --- a/tests/qemu-iotests/139 +++ b/tests/qemu-iotests/139 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Test cases for the QMP 'x-blockdev-del' command +# Test cases for the QMP 'blockdev-del' command # # Copyright (C) 2015 Igalia, S.L. # Author: Alberto Garcia @@ -79,7 +79,7 @@ class TestBlockdevDel(iotests.QMPTestCase): # Delete a BlockDriverState def delBlockDriverState(self, node, expect_error = False): self.checkBlockDriverState(node) - result = self.vm.qmp('x-blockdev-del', node_name = node) + result = self.vm.qmp('blockdev-del', node_name = node) if expect_error: self.assert_qmp(result, 'error/class', 'GenericError') else: @@ -173,7 +173,7 @@ class TestBlockdevDel(iotests.QMPTestCase): self.wait_until_completed(id) # Add a BlkDebug node - # Note that the purpose of this is to test the x-blockdev-del + # Note that the purpose of this is to test the blockdev-del # sanity checks, not to create a usable blkdebug drive def addBlkDebug(self, debug, node): self.checkBlockDriverState(node, False) @@ -191,7 +191,7 @@ class TestBlockdevDel(iotests.QMPTestCase): self.checkBlockDriverState(debug) # Add a BlkVerify node - # Note that the purpose of this is to test the x-blockdev-del + # Note that the purpose of this is to test the blockdev-del # sanity checks, not to create a usable blkverify drive def addBlkVerify(self, blkverify, test, raw): self.checkBlockDriverState(test, False) diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 index 6d8f0a1..27fb1cc 100755 --- a/tests/qemu-iotests/141 +++ b/tests/qemu-iotests/141 @@ -65,7 +65,7 @@ test_blockjob() # We want this to return an error because the block job is still running _send_qemu_cmd $QEMU_HANDLE \ - "{'execute': 'x-blockdev-del', + "{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}" \ 'error' | _filter_generated_node_ids @@ -75,7 +75,7 @@ test_blockjob() "$3" _send_qemu_cmd $QEMU_HANDLE \ - "{'execute': 'x-blockdev-del', + "{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}" \ 'return' } diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 45469c9..cca75c5 100755 --- a/tests/qemu-iotests/147 +++ b/tests/qemu-iotests/147 @@ -57,7 +57,7 @@ class NBDBlockdevAddBase(iotests.QMPTestCase): filename) break - result = self.vm.qmp('x-blockdev-del', node_name='nbd-blockdev') + result = self.vm.qmp('blockdev-del', node_name='nbd-blockdev') self.assert_qmp(result, 'return', {})