[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 9/9] block: Drop errp parameter from blk_new()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v4 9/9] block: Drop errp parameter from blk_new() |
Date: |
Tue, 17 May 2016 16:41:34 +0200 |
blk_new() cannot fail so its Error ** parameter has become superfluous.
Signed-off-by: Max Reitz <address@hidden>
---
block/block-backend.c | 9 ++-------
blockdev.c | 6 +-----
include/sysemu/block-backend.h | 2 +-
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 2a85120..75a988c 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 077d5b5..d4317d4 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 d0db3c3..9d6615c 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 d7fb0a6..c02be80 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);
--
2.8.2
- [Qemu-devel] [PATCH v4 0/9] blockdev: (Nearly) free clean-up work, Max Reitz, 2016/05/17
- [Qemu-devel] [PATCH v4 1/9] block: Drop useless bdrv_new() call, Max Reitz, 2016/05/17
- [Qemu-devel] [PATCH v4 4/9] block: Drop blk_new_with_bs(), Max Reitz, 2016/05/17
- [Qemu-devel] [PATCH v4 2/9] block: Let bdrv_open_inherit() return the snapshot, Max Reitz, 2016/05/17
- [Qemu-devel] [PATCH v4 3/9] tests: Drop BDS from test-throttle.c, Max Reitz, 2016/05/17
- [Qemu-devel] [PATCH v4 5/9] block: Drop bdrv_new_root(), Max Reitz, 2016/05/17
- [Qemu-devel] [PATCH v4 9/9] block: Drop errp parameter from blk_new(),
Max Reitz <=
- [Qemu-devel] [PATCH v4 6/9] block: Make bdrv_open() return a BDS, Max Reitz, 2016/05/17
- [Qemu-devel] [PATCH v4 7/9] block: Assert !bs->refcnt in bdrv_close(), Max Reitz, 2016/05/17
- [Qemu-devel] [PATCH v4 8/9] block: Drop bdrv_parent_cb_...() from bdrv_close(), Max Reitz, 2016/05/17
- Re: [Qemu-devel] [PATCH v4 0/9] blockdev: (Nearly) free clean-up work, Kevin Wolf, 2016/05/23