ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Drop errp parameter from blk_new() 

blk_new() cannot fail so its Error ** parameter has become superfluous.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2016-05-17 16:41:34 +02:00 committed by Kevin Wolf
parent 6b574e09b3
commit 109525ad6a
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/block-backend.c
View File

@ -119,7 +119,7 @@ static const BdrvChildRole child_root = {
* Store an error through @errp on failure, unless it's null. * Store an error through @errp on failure, unless it's null.
* Return the new BlockBackend on success, null on failure. * Return the new BlockBackend on success, null on failure.
*/ */
BlockBackend *blk_new(Error **errp) BlockBackend *blk_new(void)
{ {
BlockBackend *blk; BlockBackend *blk;
@ -153,12 +153,7 @@ BlockBackend *blk_new_open(const char *filename, const char *reference,
BlockBackend *blk; BlockBackend *blk;
BlockDriverState *bs; BlockDriverState *bs;
blk = blk_new(errp); blk = blk_new();
if (!blk) {
QDECREF(options);
return NULL;
}
bs = bdrv_open(filename, reference, options, flags, errp); bs = bdrv_open(filename, reference, options, flags, errp);
if (!bs) { if (!bs) {
blk_unref(blk); blk_unref(blk);

6
blockdev.c
View File

@ -567,11 +567,7 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts,
if ((!file || !*file) && !qdict_size(bs_opts)) { if ((!file || !*file) && !qdict_size(bs_opts)) {
BlockBackendRootState *blk_rs; BlockBackendRootState *blk_rs;
blk = blk_new(errp); blk = blk_new();
if (!blk) {
goto early_err;
}
blk_rs = blk_get_root_state(blk); blk_rs = blk_get_root_state(blk);
blk_rs->open_flags = bdrv_flags; blk_rs->open_flags = bdrv_flags;
blk_rs->read_only = !(bdrv_flags & BDRV_O_RDWR); blk_rs->read_only = !(bdrv_flags & BDRV_O_RDWR);

2
include/sysemu/block-backend.h
View File

@ -78,7 +78,7 @@ typedef struct BlockBackendPublic {
QLIST_ENTRY(BlockBackendPublic) round_robin; QLIST_ENTRY(BlockBackendPublic) round_robin;
} BlockBackendPublic; } BlockBackendPublic;
BlockBackend *blk_new(Error **errp); BlockBackend *blk_new(void);
BlockBackend *blk_new_open(const char *filename, const char *reference, BlockBackend *blk_new_open(const char *filename, const char *reference,
QDict *options, int flags, Error **errp); QDict *options, int flags, Error **errp);
int blk_get_refcnt(BlockBackend *blk); int blk_get_refcnt(BlockBackend *blk);

6
tests/test-throttle.c
View File

@ -578,9 +578,9 @@ static void test_groups(void)
BlockBackend *blk1, *blk2, *blk3; BlockBackend *blk1, *blk2, *blk3;
BlockBackendPublic *blkp1, *blkp2, *blkp3; BlockBackendPublic *blkp1, *blkp2, *blkp3;
blk1 = blk_new(&error_abort); blk1 = blk_new();
blk2 = blk_new(&error_abort); blk2 = blk_new();
blk3 = blk_new(&error_abort); blk3 = blk_new();
blkp1 = blk_get_public(blk1); blkp1 = blk_get_public(blk1);
blkp2 = blk_get_public(blk2); blkp2 = blk_get_public(blk2);