mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-23 10:53:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

block: Add QMP support for streaming to an intermediate layer

Browse Source 
This patch makes the 'device' parameter of the 'block-stream' command
accept a node name that is not a root node. The presence of this
feature can't be directly tested with introspection; soon we'll
introduce a 'base-node' parameter whose presence can be checked for
this purpose.

In addition to that, operation blockers will be checked in all
intermediate nodes between the top and the base node.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Alberto Garcia 2016-10-28 10:08:11 +03:00 committed by Kevin Wolf
parent 61b49e48b3
commit 554b614765
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
blockdev.c
View File

@ -2937,7 +2937,7 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device,
bool has_on_error, BlockdevOnError on_error, bool has_on_error, BlockdevOnError on_error,
Error **errp) Error **errp)
{ {
BlockDriverState *bs; BlockDriverState *bs, *iter;
BlockDriverState *base_bs = NULL; BlockDriverState *base_bs = NULL;
AioContext *aio_context; AioContext *aio_context;
Error *local_err = NULL; Error *local_err = NULL;
@ -2947,7 +2947,7 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device,
on_error = BLOCKDEV_ON_ERROR_REPORT; on_error = BLOCKDEV_ON_ERROR_REPORT;
} }
bs = qmp_get_root_bs(device, errp); bs = bdrv_lookup_bs(device, device, errp);
if (!bs) { if (!bs) {
return; return;
} }
@ -2955,10 +2955,6 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device,
aio_context = bdrv_get_aio_context(bs); aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context); aio_context_acquire(aio_context);
if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_STREAM, errp)) {
goto out;
}
if (has_base) { if (has_base) {
base_bs = bdrv_find_backing_image(bs, base); base_bs = bdrv_find_backing_image(bs, base);
if (base_bs == NULL) { if (base_bs == NULL) {
@ -2969,6 +2965,13 @@ void qmp_block_stream(bool has_job_id, const char *job_id, const char *device,
base_name = base; base_name = base;
} }
/* Check for op blockers in the whole chain between bs and base */
for (iter = bs; iter && iter != base_bs; iter = backing_bs(iter)) {
if (bdrv_op_is_blocked(iter, BLOCK_OP_TYPE_STREAM, errp)) {
goto out;
}
}
/* if we are streaming the entire chain, the result will have no backing /* if we are streaming the entire chain, the result will have no backing
* file, and specifying one is therefore an error */ * file, and specifying one is therefore an error */
if (base_bs == NULL && has_backing_file) { if (base_bs == NULL && has_backing_file) {

13
qapi/block-core.json
View File

@ -1464,6 +1464,13 @@
# with query-block-jobs. The operation can be stopped before it has completed # with query-block-jobs. The operation can be stopped before it has completed
# using the block-job-cancel command. # using the block-job-cancel command.
# #
# The node that receives the data is called the top image, can be located in
# any part of the chain (but always above the base image; see below) and can be
# specified using its device or node name. Earlier qemu versions only allowed
# 'device' to name the top level node; presence of the 'base-node' parameter
# during introspection can be used as a witness of the enhanced semantics
# of 'device'.
#
# If a base file is specified then sectors are not copied from that base file and # If a base file is specified then sectors are not copied from that base file and
# its backing chain. When streaming completes the image file will have the base # its backing chain. When streaming completes the image file will have the base
# file as its backing file. This can be used to stream a subset of the backing # file as its backing file. This can be used to stream a subset of the backing
@ -1475,12 +1482,12 @@
# @job-id: #optional identifier for the newly-created block job. If # @job-id: #optional identifier for the newly-created block job. If
# omitted, the device name will be used. (Since 2.7) # omitted, the device name will be used. (Since 2.7)
# #
# @device: the device name or node-name of a root node # @device: the device or node name of the top image
# #
# @base: #optional the common backing file name # @base: #optional the common backing file name
# #
# @backing-file: #optional The backing file string to write into the active # @backing-file: #optional The backing file string to write into the top
# layer. This filename is not validated. # image. This filename is not validated.
# #
# If a pathname string is such that it cannot be # If a pathname string is such that it cannot be
# resolved by QEMU, that means that subsequent QMP or # resolved by QEMU, that means that subsequent QMP or