From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUuFJ-0000qK-Sg for qemu-devel@nongnu.org; Wed, 03 Aug 2016 07:21:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUuFI-0006J0-L8 for qemu-devel@nongnu.org; Wed, 03 Aug 2016 07:21:57 -0400 From: Kevin Wolf Date: Wed, 3 Aug 2016 13:21:30 +0200 Message-Id: <1470223294-3870-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1470223294-3870-1-git-send-email-kwolf@redhat.com> References: <1470223294-3870-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v5 07/11] block: Accept node-name for change-backing-file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, eblake@redhat.com, berto@igalia.com, qemu-devel@nongnu.org In order to remove the necessity to use BlockBackend names in the external API, we want to allow node-names everywhere. This converts change-backing-file to accept a node-name without lifting the restriction that we're operating at a root node. In case of an invalid device name, the command returns the GenericError error class now instead of DeviceNotFound, because this is what qmp_get_root_bs() returns. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia --- blockdev.c | 15 +++------------ qapi/block-core.json | 3 ++- qmp-commands.hx | 3 ++- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/blockdev.c b/blockdev.c index f775bbd..a42c802 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3755,7 +3755,6 @@ void qmp_change_backing_file(const char *device, const char *backing_file, Error **errp) { - BlockBackend *blk; BlockDriverState *bs = NULL; AioContext *aio_context; BlockDriverState *image_bs = NULL; @@ -3764,22 +3763,14 @@ void qmp_change_backing_file(const char *device, int open_flags; int ret; - blk = blk_by_name(device); - if (!blk) { - error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, - "Device '%s' not found", device); + bs = qmp_get_root_bs(device, errp); + if (!bs) { return; } - aio_context = blk_get_aio_context(blk); + aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context); - if (!blk_is_available(blk)) { - error_setg(errp, "Device '%s' has no medium", device); - goto out; - } - bs = blk_bs(blk); - image_bs = bdrv_lookup_bs(NULL, image_node_name, &local_err); if (local_err) { error_propagate(errp, local_err); diff --git a/qapi/block-core.json b/qapi/block-core.json index bcb37db..d25ba46 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -998,7 +998,8 @@ # @image-node-name: The name of the block driver state node of the # image to modify. # -# @device: The name of the device that owns image-node-name. +# @device: The device name or node-name of the root node that owns +# image-node-name. # # @backing-file: The string to write as the backing file. This # string is not validated, so care should be taken diff --git a/qmp-commands.hx b/qmp-commands.hx index 8a53539..bd54b34 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1806,7 +1806,8 @@ Arguments: "device". (json-string, optional) -- "device": The name of the device. +- "device": The device name or node-name of the root node that owns + image-node-name. (json-string) - "backing-file": The string to write as the backing file. This string is -- 1.8.3.1