From patchwork Mon Feb 8 14:14:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 580292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 62979140B93 for ; Tue, 9 Feb 2016 01:15:03 +1100 (AEDT) Received: from localhost ([::1]:45147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSmaj-0007KU-C7 for incoming@patchwork.ozlabs.org; Mon, 08 Feb 2016 09:15:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSmaF-0006Tr-FN for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:14:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSmaA-0004UQ-Va for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:14:31 -0500 Received: from smtp3.mundo-r.com ([212.51.32.191]:14858 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSmaA-0004TY-Ov; Mon, 08 Feb 2016 09:14:26 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DjAgA/orhW/5tjdVtdGQEBAQEPAQEBAYMKgT+IW51CAQEBAQEBBQGBDwGQGoITAQ2BZoYNAoEqOBQBAQEBAQEBgQqEQgEBBHAJED8SPBsZiB8BvGUBAQEHIIVKgj2HQINuBZZ1jVCBW40YhW6IUB4BAUKDZmiIUwEBAQ X-IPAS-Result: A2DjAgA/orhW/5tjdVtdGQEBAQEPAQEBAYMKgT+IW51CAQEBAQEBBQGBDwGQGoITAQ2BZoYNAoEqOBQBAQEBAQEBgQqEQgEBBHAJED8SPBsZiB8BvGUBAQEHIIVKgj2HQINuBZZ1jVCBW40YhW6IUB4BAUKDZmiIUwEBAQ X-IronPort-AV: E=Sophos;i="5.22,416,1449529200"; d="scan'208";a="14096449" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 08 Feb 2016 15:14:21 +0100 Received: from dsl-hkibrasgw4-50df50-201.dhcp.inet.fi ([80.223.80.201] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim) id 1aSma5-0003Dc-E6; Mon, 08 Feb 2016 15:14:21 +0100 Received: from berto by perseus.local with local (Exim 4.86) (envelope-from ) id 1aSmZr-00064p-Vv; Mon, 08 Feb 2016 16:14:07 +0200 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Mon, 8 Feb 2016 16:14:05 +0200 Message-Id: <07c19103660708d7b728f9521686b07c7a021645.1454940776.git.berto@igalia.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <7bfce913f68d95284746e7cf3693703f5361b26f.1454940776.git.berto@igalia.com> References: <7bfce913f68d95284746e7cf3693703f5361b26f.1454940776.git.berto@igalia.com> In-Reply-To: <7bfce913f68d95284746e7cf3693703f5361b26f.1454940776.git.berto@igalia.com> References: <7bfce913f68d95284746e7cf3693703f5361b26f.1454940776.git.berto@igalia.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Subject: [Qemu-devel] [PATCH 3/3] block: Update the x-blockdev-del documentation 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Explain what happens if the user tries to delete a BlockBackend that contains media that was added separately using blockdev-add. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake --- qapi/block-core.json | 5 ++++- qmp-commands.hx | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 33012b8..cc59ab9 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2089,7 +2089,10 @@ # # In the former case the backend will be destroyed, along with its # inserted medium if there's any. The command will fail if the backend -# or its medium are in use. +# or its medium are in use. If the medium was also created with +# blockdev-add then the command will succeed, the backend will be +# destroyed but the medium will remain until it is deleted with +# x-blockdev-del. # # In the latter case the node will be destroyed. The command will fail # if the node is attached to a block backend or is otherwise being diff --git a/qmp-commands.hx b/qmp-commands.hx index 020e5ee..9710686 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -4151,7 +4151,10 @@ The selected device can be either a block backend or a graph node. In the former case the backend will be destroyed, along with its inserted medium if there's any. The command will fail if the backend -or its medium are in use. +or its medium are in use. If the medium was also created with +blockdev-add then the command will succeed, the backend will be +destroyed but the medium will remain until it is deleted with +x-blockdev-del. In the latter case the node will be destroyed. The command will fail if the node is attached to a block backend or is otherwise being