diff options
| -rw-r--r-- | block/backup.c | 2 | ||||
| -rw-r--r-- | block/commit.c | 2 | ||||
| -rw-r--r-- | block/mirror.c | 3 | ||||
| -rw-r--r-- | block/stream.c | 2 | ||||
| -rw-r--r-- | blockjob.c | 25 | ||||
| -rw-r--r-- | include/block/blockjob.h | 7 | ||||
| -rw-r--r-- | tests/test-blockjob-txn.c | 3 | ||||
| -rw-r--r-- | tests/test-blockjob.c | 2 |
8 files changed, 30 insertions, 16 deletions
diff --git a/block/backup.c b/block/backup.c index 44c7ff3..3877d93 100644 --- a/block/backup.c +++ b/block/backup.c @@ -612,7 +612,7 @@ void backup_start(const char *job_id, BlockDriverState *bs, } job = block_job_create(job_id, &backup_job_driver, bs, speed, - cb, opaque, errp); + BLOCK_JOB_DEFAULT, cb, opaque, errp); if (!job) { goto error; } diff --git a/block/commit.c b/block/commit.c index a5e17f6..0740a41 100644 --- a/block/commit.c +++ b/block/commit.c @@ -234,7 +234,7 @@ void commit_start(const char *job_id, BlockDriverState *bs, } s = block_job_create(job_id, &commit_job_driver, bs, speed, - cb, opaque, errp); + BLOCK_JOB_DEFAULT, cb, opaque, errp); if (!s) { return; } diff --git a/block/mirror.c b/block/mirror.c index 82a9529..e9fba9b 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -967,7 +967,8 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, buf_size = DEFAULT_MIRROR_BUF_SIZE; } - s = block_job_create(job_id, driver, bs, speed, cb, opaque, errp); + s = block_job_create(job_id, driver, bs, speed, + BLOCK_JOB_DEFAULT, cb, opaque, errp); if (!s) { return; } diff --git a/block/stream.c b/block/stream.c index b8ab89a..09ce9ef 100644 --- a/block/stream.c +++ b/block/stream.c @@ -230,7 +230,7 @@ void stream_start(const char *job_id, BlockDriverState *bs, int orig_bs_flags; s = block_job_create(job_id, &stream_job_driver, bs, speed, - cb, opaque, errp); + BLOCK_JOB_DEFAULT, cb, opaque, errp); if (!s) { return; } @@ -121,7 +121,7 @@ void block_job_add_bdrv(BlockJob *job, BlockDriverState *bs) } void *block_job_create(const char *job_id, const BlockJobDriver *driver, - BlockDriverState *bs, int64_t speed, + BlockDriverState *bs, int64_t speed, int flags, BlockCompletionFunc *cb, void *opaque, Error **errp) { BlockBackend *blk; @@ -133,7 +133,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, return NULL; } - if (job_id == NULL) { + if (job_id == NULL && !(flags & BLOCK_JOB_INTERNAL)) { job_id = bdrv_get_device_name(bs); if (!*job_id) { error_setg(errp, "An explicit job ID is required for this node"); @@ -141,14 +141,21 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, } } - if (!id_wellformed(job_id)) { - error_setg(errp, "Invalid job ID '%s'", job_id); - return NULL; - } + if (job_id) { + if (flags & BLOCK_JOB_INTERNAL) { + error_setg(errp, "Cannot specify job ID for internal block job"); + return NULL; + } - if (block_job_get(job_id)) { - error_setg(errp, "Job ID '%s' already in use", job_id); - return NULL; + if (!id_wellformed(job_id)) { + error_setg(errp, "Invalid job ID '%s'", job_id); + return NULL; + } + + if (block_job_get(job_id)) { + error_setg(errp, "Job ID '%s' already in use", job_id); + return NULL; + } } blk = blk_new(); diff --git a/include/block/blockjob.h b/include/block/blockjob.h index a1b7502..d0d9333 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -210,6 +210,11 @@ struct BlockJob { QLIST_ENTRY(BlockJob) txn_list; }; +typedef enum BlockJobCreateFlags { + BLOCK_JOB_DEFAULT = 0x00, + BLOCK_JOB_INTERNAL = 0x01, +} BlockJobCreateFlags; + /** * block_job_next: * @job: A block job, or %NULL. @@ -252,7 +257,7 @@ BlockJob *block_job_get(const char *id); * called from a wrapper that is specific to the job type. */ void *block_job_create(const char *job_id, const BlockJobDriver *driver, - BlockDriverState *bs, int64_t speed, + BlockDriverState *bs, int64_t speed, int flags, BlockCompletionFunc *cb, void *opaque, Error **errp); /** diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c index d049cba..b79e0c6 100644 --- a/tests/test-blockjob-txn.c +++ b/tests/test-blockjob-txn.c @@ -98,7 +98,8 @@ static BlockJob *test_block_job_start(unsigned int iterations, bs = bdrv_new(); snprintf(job_id, sizeof(job_id), "job%u", counter++); s = block_job_create(job_id, &test_block_job_driver, bs, 0, - test_block_job_cb, data, &error_abort); + BLOCK_JOB_DEFAULT, test_block_job_cb, + data, &error_abort); s->iterations = iterations; s->use_timer = use_timer; s->rc = rc; diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c index 5b0e934..18bf850 100644 --- a/tests/test-blockjob.c +++ b/tests/test-blockjob.c @@ -31,7 +31,7 @@ static BlockJob *do_test_id(BlockBackend *blk, const char *id, Error *errp = NULL; job = block_job_create(id, &test_block_job_driver, blk_bs(blk), 0, - block_job_cb, NULL, &errp); + BLOCK_JOB_DEFAULT, block_job_cb, NULL, &errp); if (should_succeed) { g_assert_null(errp); g_assert_nonnull(job); |