[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 29/42] block: Use bdrv_open_image() in bdrv_open()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 29/42] block: Use bdrv_open_image() in bdrv_open() |
Date: |
Wed, 15 Jan 2014 11:22:42 +0100 |
From: Max Reitz <address@hidden>
Using bdrv_open_image() instead of bdrv_file_open() directly in
bdrv_open() is easier.
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/block.c b/block.c
index 76b6c25..9e4e85f 100644
--- a/block.c
+++ b/block.c
@@ -1128,8 +1128,6 @@ int bdrv_open(BlockDriverState *bs, const char *filename,
QDict *options,
/* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */
char tmp_filename[PATH_MAX + 1];
BlockDriverState *file = NULL;
- QDict *file_options = NULL;
- const char *file_reference;
const char *drvname;
Error *local_err = NULL;
@@ -1215,17 +1213,11 @@ int bdrv_open(BlockDriverState *bs, const char
*filename, QDict *options,
flags |= BDRV_O_ALLOW_RDWR;
}
- qdict_extract_subqdict(options, &file_options, "file.");
- file_reference = qdict_get_try_str(options, "file");
-
- if (filename || file_reference || qdict_size(file_options)) {
- ret = bdrv_file_open(&file, filename, file_reference, file_options,
- bdrv_open_flags(bs, flags | BDRV_O_UNMAP),
- &local_err);
- qdict_del(options, "file");
- if (ret < 0) {
- goto fail;
- }
+ ret = bdrv_open_image(&file, filename, options, "file",
+ bdrv_open_flags(bs, flags | BDRV_O_UNMAP), true,
true,
+ &local_err);
+ if (ret < 0) {
+ goto fail;
}
/* Find the right image format driver */
--
1.8.1.4
- [Qemu-devel] [PULL 16/42] qemu-io: use readline.c, (continued)
- [Qemu-devel] [PULL 16/42] qemu-io: use readline.c, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 18/42] blkdebug: Use errp for read_config(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 21/42] qapi: extend qdict_flatten() for QLists, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 19/42] blkdebug: Don't require sophisticated filename, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 22/42] qemu-option: Add qemu_config_parse_qdict(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 24/42] blkdebug: Use command-line in read_config(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 23/42] blkdebug: Always call read_config(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 26/42] block: Pass reference to bdrv_file_open(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 25/42] block: Allow reference for bdrv_file_open(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 28/42] block: Add bdrv_open_image(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 29/42] block: Use bdrv_open_image() in bdrv_open(),
Kevin Wolf <=
- [Qemu-devel] [PULL 31/42] blockdev: Move "file" to legacy_opts, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 32/42] blkdebug: Allow command-line file configuration, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 30/42] block: Allow recursive "file"s, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 33/42] blkverify: Allow command-line configuration, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 35/42] qapi: Add "errno" to the list of polluted words, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 34/42] blkverify: Don't require protocol filename, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 36/42] qapi: QMP interface for blkdebug and blkverify, Kevin Wolf, 2014/01/15