[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 4/9] block: Drop blk_new_with_bs()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v4 4/9] block: Drop blk_new_with_bs() |
Date: |
Tue, 17 May 2016 16:41:29 +0200 |
Its only caller is blk_new_open(), so we can just inline it there.
The bdrv_new_root() call is dropped in the process because we can just
let bdrv_open() create the BDS.
Signed-off-by: Max Reitz <address@hidden>
---
block/block-backend.c | 30 +++++++-----------------------
include/sysemu/block-backend.h | 1 -
2 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 6928d61..287de44 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -136,27 +136,7 @@ BlockBackend *blk_new(Error **errp)
}
/*
- * Create a new BlockBackend with a new BlockDriverState attached.
- * Otherwise just like blk_new(), which see.
- */
-BlockBackend *blk_new_with_bs(Error **errp)
-{
- BlockBackend *blk;
- BlockDriverState *bs;
-
- blk = blk_new(errp);
- if (!blk) {
- return NULL;
- }
-
- bs = bdrv_new_root();
- blk->root = bdrv_root_attach_child(bs, "root", &child_root);
- blk->root->opaque = blk;
- return blk;
-}
-
-/*
- * Calls blk_new_with_bs() and then calls bdrv_open() on the BlockDriverState.
+ * Creates a new BlockBackend, opens a new BlockDriverState, and connects both.
*
* Just as with bdrv_open(), after having called this function the reference to
* @options belongs to the block layer (even on failure).
@@ -171,21 +151,25 @@ BlockBackend *blk_new_open(const char *filename, const
char *reference,
QDict *options, int flags, Error **errp)
{
BlockBackend *blk;
+ BlockDriverState *bs;
int ret;
- blk = blk_new_with_bs(errp);
+ blk = blk_new(errp);
if (!blk) {
QDECREF(options);
return NULL;
}
- ret = bdrv_open(&blk->root->bs, filename, reference, options, flags, errp);
+ bs = NULL;
+ ret = bdrv_open(&bs, filename, reference, options, flags, errp);
if (ret < 0) {
blk_unref(blk);
return NULL;
}
blk_set_enable_write_cache(blk, true);
+ blk->root = bdrv_root_attach_child(bs, "root", &child_root);
+ blk->root->opaque = blk;
return blk;
}
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 68d92b5..d0db3c3 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -79,7 +79,6 @@ typedef struct BlockBackendPublic {
} BlockBackendPublic;
BlockBackend *blk_new(Error **errp);
-BlockBackend *blk_new_with_bs(Error **errp);
BlockBackend *blk_new_open(const char *filename, const char *reference,
QDict *options, int flags, Error **errp);
int blk_get_refcnt(BlockBackend *blk);
--
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 <=
- [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, 2016/05/17
- [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