From patchwork Tue Feb 23 17:16:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 8395041 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D2284C0553 for ; Tue, 23 Feb 2016 17:17:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9541F20304 for ; Tue, 23 Feb 2016 17:17:24 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 243D12028D for ; Tue, 23 Feb 2016 17:17:19 +0000 (UTC) Received: from localhost ([::1]:58693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYGaM-0003uR-Dv for patchwork-qemu-devel@patchwork.kernel.org; Tue, 23 Feb 2016 12:17:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYGa7-0003pu-AE for qemu-devel@nongnu.org; Tue, 23 Feb 2016 12:17:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYGa2-0000Pz-Cq for qemu-devel@nongnu.org; Tue, 23 Feb 2016 12:17:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYGZx-0000Me-LE; Tue, 23 Feb 2016 12:16:53 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 4E300BC6AA; Tue, 23 Feb 2016 17:16:53 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-58.ams2.redhat.com [10.36.116.58]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1NHGjha028654; Tue, 23 Feb 2016 12:16:51 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 23 Feb 2016 18:16:39 +0100 Message-Id: <1456247799-9593-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1456247799-9593-1-git-send-email-kwolf@redhat.com> References: <1456247799-9593-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pkrempa@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, mreitz@redhat.com Subject: [Qemu-devel] [PATCH 2/2] hmp: Extend drive_del to delete nodes without BB X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that we can use drive_add to create new nodes without a BB, we also want to be able to delete such nodes again. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- blockdev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/blockdev.c b/blockdev.c index 3f46bc1..b76b6cd 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2816,6 +2816,15 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict) AioContext *aio_context; Error *local_err = NULL; + bs = bdrv_find_node(id); + if (bs) { + qmp_x_blockdev_del(false, NULL, true, id, &local_err); + if (local_err) { + error_report_err(local_err); + } + return; + } + blk = blk_by_name(id); if (!blk) { error_report("Device '%s' not found", id);