On 01.07.2016 17:52, Alberto Garcia wrote:
> img_commit() creates a block job without an ID. This is no longer
> allowed now that we require it to be unique and well-formed. We were
> solving this by having a fallback in block_job_create(), but now that
> we extended the API of commit_active_start() we can finally set an
> explicit ID and revert that change.
>
> Signed-off-by: Alberto Garcia <be...@igalia.com>
> ---
> blockjob.c | 6 ------
> qemu-img.c | 2 +-
> 2 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/blockjob.c b/blockjob.c
> index 511c0db..3b9cec7 100644
> --- a/blockjob.c
> +++ b/blockjob.c
> @@ -132,12 +132,6 @@ void *block_job_create(const char *job_id, const
> BlockJobDriver *driver,
>
> if (job_id == NULL) {
> job_id = bdrv_get_device_name(bs);
> - /* Assign a default ID if the BDS does not have a device
> - * name. We'll get rid of this soon when we finish extending
> - * the API of all commands that create block jobs. */
> - if (job_id[0] == '\0') {
> - job_id = "default_job";
> - }
I think keeping an assertion here makes sense, though.
In any case:
Reviewed-by: Max Reitz <mre...@redhat.com>
> }
>
> if (!id_wellformed(job_id)) {
> diff --git a/qemu-img.c b/qemu-img.c
> index a78f598..521724c 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -921,7 +921,7 @@ static int img_commit(int argc, char **argv)
> .bs = bs,
> };
>
> - commit_active_start(NULL, bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT,
> + commit_active_start("commit", bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT,
> common_block_job_cb, &cbi, &local_err);
> if (local_err) {
> goto done;
>
signature.asc
Description: OpenPGP digital signature
