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 /migration | |
| 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 'migration')
| -rw-r--r-- | migration/block.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/block.c b/migration/block.c index 6b7ffd4eb6..d2599360a0 100644 --- a/migration/block.c +++ b/migration/block.c @@ -446,7 +446,7 @@ static void init_blk_migration(QEMUFile *f) BlockDriverState *bs = bmds_bs[i].bs; if (bmds) { - blk_insert_bs(bmds->blk, bs); + blk_insert_bs(bmds->blk, bs, &error_abort); alloc_aio_bitmap(bmds); error_setg(&bmds->blocker, "block device is in use by migration"); |