diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-01-13 19:02:32 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-02-28 20:40:36 +0100 |
| commit | d7086422b1c1e75e320519cfe26176db6ec97a37 (patch) | |
| tree | 5b8cc8a489ee05f6432288590f1b621bccfa39c4 /blockjob.c | |
| parent | 6d0eb64d5c6d57017c52a4f36ccae1db79215ee1 (diff) | |
block: Add error parameter to blk_insert_bs()
Now that blk_insert_bs() requests the BlockBackend permissions for the
node it attaches to, it can fail. Instead of aborting, pass the errors
to the callers.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Acked-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'blockjob.c')
| -rw-r--r-- | blockjob.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/blockjob.c b/blockjob.c index 508e0e5069..72b7d4c3f2 100644 --- a/blockjob.c +++ b/blockjob.c @@ -128,6 +128,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, { BlockBackend *blk; BlockJob *job; + int ret; if (bs->job) { error_setg(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(bs)); @@ -161,7 +162,11 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, /* FIXME Use real permissions */ blk = blk_new(0, BLK_PERM_ALL); - blk_insert_bs(blk, bs); + ret = blk_insert_bs(blk, bs, errp); + if (ret < 0) { + blk_unref(blk); + return NULL; + } job = g_malloc0(driver->instance_size); error_setg(&job->blocker, "block device is in use by block job: %s", |