diff options
| -rw-r--r-- | block/block-backend.c | 9 | ||||
| -rw-r--r-- | blockdev.c | 6 | ||||
| -rw-r--r-- | include/sysemu/block-backend.h | 2 | ||||
| -rw-r--r-- | tests/test-throttle.c | 6 |
4 files changed, 7 insertions, 16 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index bc1f071354..4e8298b291 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -119,7 +119,7 @@ static const BdrvChildRole child_root = { * Store an error through @errp on failure, unless it's null. * Return the new BlockBackend on success, null on failure. */ -BlockBackend *blk_new(Error **errp) +BlockBackend *blk_new(void) { BlockBackend *blk; @@ -153,12 +153,7 @@ BlockBackend *blk_new_open(const char *filename, const char *reference, BlockBackend *blk; BlockDriverState *bs; - blk = blk_new(errp); - if (!blk) { - QDECREF(options); - return NULL; - } - + blk = blk_new(); bs = bdrv_open(filename, reference, options, flags, errp); if (!bs) { blk_unref(blk); diff --git a/blockdev.c b/blockdev.c index 7d4a1ba1a6..af0b022e6f 100644 --- a/blockdev.c +++ b/blockdev.c @@ -567,11 +567,7 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, if ((!file || !*file) && !qdict_size(bs_opts)) { BlockBackendRootState *blk_rs; - blk = blk_new(errp); - if (!blk) { - goto early_err; - } - + blk = blk_new(); blk_rs = blk_get_root_state(blk); blk_rs->open_flags = bdrv_flags; blk_rs->read_only = !(bdrv_flags & BDRV_O_RDWR); diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index d0db3c381a..9d6615cbf7 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -78,7 +78,7 @@ typedef struct BlockBackendPublic { QLIST_ENTRY(BlockBackendPublic) round_robin; } BlockBackendPublic; -BlockBackend *blk_new(Error **errp); +BlockBackend *blk_new(void); BlockBackend *blk_new_open(const char *filename, const char *reference, QDict *options, int flags, Error **errp); int blk_get_refcnt(BlockBackend *blk); diff --git a/tests/test-throttle.c b/tests/test-throttle.c index d7fb0a6451..c02be805f7 100644 --- a/tests/test-throttle.c +++ b/tests/test-throttle.c @@ -578,9 +578,9 @@ static void test_groups(void) BlockBackend *blk1, *blk2, *blk3; BlockBackendPublic *blkp1, *blkp2, *blkp3; - blk1 = blk_new(&error_abort); - blk2 = blk_new(&error_abort); - blk3 = blk_new(&error_abort); + blk1 = blk_new(); + blk2 = blk_new(); + blk3 = blk_new(); blkp1 = blk_get_public(blk1); blkp2 = blk_get_public(blk2); |