mirror of https://github.com/proxmox/mirror_qemu
stream: Fix prototype of stream_start()
'stream-start' has a parameter called 'backing-file', which is the string to be written to bs->backing when the job finishes. In the stream_start() implementation it is called 'backing_file_str', but it the prototype in the header file it is called 'base_id'. This patch fixes it so the name is the same in both cases and is consistent with other cases (like commit_start()). Signed-off-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>master
parent
ca3d87d4c8
commit
29338003c9
|
@ -642,8 +642,8 @@ int is_windows_drive(const char *filename);
|
||||||
* @bs: Block device to operate on.
|
* @bs: Block device to operate on.
|
||||||
* @base: Block device that will become the new base, or %NULL to
|
* @base: Block device that will become the new base, or %NULL to
|
||||||
* flatten the whole backing file chain onto @bs.
|
* flatten the whole backing file chain onto @bs.
|
||||||
* @base_id: The file name that will be written to @bs as the new
|
* @backing_file_str: The file name that will be written to @bs as the
|
||||||
* backing file if the job completes. Ignored if @base is %NULL.
|
* the new backing file if the job completes. Ignored if @base is %NULL.
|
||||||
* @speed: The maximum speed, in bytes per second, or 0 for unlimited.
|
* @speed: The maximum speed, in bytes per second, or 0 for unlimited.
|
||||||
* @on_error: The action to take upon error.
|
* @on_error: The action to take upon error.
|
||||||
* @cb: Completion function for the job.
|
* @cb: Completion function for the job.
|
||||||
|
@ -654,11 +654,12 @@ int is_windows_drive(const char *filename);
|
||||||
* in @bs, but allocated in any image between @base and @bs (both
|
* in @bs, but allocated in any image between @base and @bs (both
|
||||||
* exclusive) will be written to @bs. At the end of a successful
|
* exclusive) will be written to @bs. At the end of a successful
|
||||||
* streaming job, the backing file of @bs will be changed to
|
* streaming job, the backing file of @bs will be changed to
|
||||||
* @base_id in the written image and to @base in the live BlockDriverState.
|
* @backing_file_str in the written image and to @base in the live
|
||||||
|
* BlockDriverState.
|
||||||
*/
|
*/
|
||||||
void stream_start(BlockDriverState *bs, BlockDriverState *base,
|
void stream_start(BlockDriverState *bs, BlockDriverState *base,
|
||||||
const char *base_id, int64_t speed, BlockdevOnError on_error,
|
const char *backing_file_str, int64_t speed,
|
||||||
BlockCompletionFunc *cb,
|
BlockdevOnError on_error, BlockCompletionFunc *cb,
|
||||||
void *opaque, Error **errp);
|
void *opaque, Error **errp);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue