[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/23] block: Drop drv parameter from bdrv_fill_optio
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 04/23] block: Drop drv parameter from bdrv_fill_options() |
Date: |
Fri, 11 Sep 2015 21:40:44 +0200 |
From: Max Reitz <address@hidden>
Now that this parameter is effectively unused, we can drop it and change
the function accordingly.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 59 ++++++++++++++++++++++-------------------------------------
1 file changed, 22 insertions(+), 37 deletions(-)
diff --git a/block.c b/block.c
index 52fa7f8..7c61555 100644
--- a/block.c
+++ b/block.c
@@ -996,13 +996,13 @@ static QDict *parse_json_filename(const char *filename,
Error **errp)
* block driver has been specified explicitly.
*/
static int bdrv_fill_options(QDict **options, const char **pfilename,
- int *flags, BlockDriver *drv, Error **errp)
+ int *flags, Error **errp)
{
const char *filename = *pfilename;
const char *drvname;
bool protocol = *flags & BDRV_O_PROTOCOL;
bool parse_filename = false;
- BlockDriver *tmp_drv;
+ BlockDriver *drv = NULL;
Error *local_err = NULL;
/* Parse json: pseudo-protocol */
@@ -1021,15 +1021,15 @@ static int bdrv_fill_options(QDict **options, const
char **pfilename,
}
drvname = qdict_get_try_str(*options, "driver");
-
- /* If the user has explicitly specified the driver, this choice should
- * override the BDRV_O_PROTOCOL flag */
- tmp_drv = drv;
- if (!tmp_drv && drvname) {
- tmp_drv = bdrv_find_format(drvname);
- }
- if (tmp_drv) {
- protocol = tmp_drv->bdrv_file_open;
+ if (drvname) {
+ drv = bdrv_find_format(drvname);
+ if (!drv) {
+ error_setg(errp, "Unknown driver '%s'", drvname);
+ return -ENOENT;
+ }
+ /* If the user has explicitly specified the driver, this choice should
+ * override the BDRV_O_PROTOCOL flag */
+ protocol = drv->bdrv_file_open;
}
if (protocol) {
@@ -1053,33 +1053,18 @@ static int bdrv_fill_options(QDict **options, const
char **pfilename,
/* Find the right block driver */
filename = qdict_get_try_str(*options, "filename");
- if (drv) {
- if (drvname) {
- error_setg(errp, "Driver specified twice");
- return -EINVAL;
- }
- drvname = drv->format_name;
- qdict_put(*options, "driver", qstring_from_str(drvname));
- } else {
- if (!drvname && protocol) {
- if (filename) {
- drv = bdrv_find_protocol(filename, parse_filename, errp);
- if (!drv) {
- return -EINVAL;
- }
-
- drvname = drv->format_name;
- qdict_put(*options, "driver", qstring_from_str(drvname));
- } else {
- error_setg(errp, "Must specify either driver or file");
- return -EINVAL;
- }
- } else if (drvname) {
- drv = bdrv_find_format(drvname);
+ if (!drvname && protocol) {
+ if (filename) {
+ drv = bdrv_find_protocol(filename, parse_filename, errp);
if (!drv) {
- error_setg(errp, "Unknown driver '%s'", drvname);
- return -ENOENT;
+ return -EINVAL;
}
+
+ drvname = drv->format_name;
+ qdict_put(*options, "driver", qstring_from_str(drvname));
+ } else {
+ error_setg(errp, "Must specify either driver or file");
+ return -EINVAL;
}
}
@@ -1474,7 +1459,7 @@ static int bdrv_open_inherit(BlockDriverState **pbs,
const char *filename,
flags = child_role->inherit_flags(parent->open_flags);
}
- ret = bdrv_fill_options(&options, &filename, &flags, NULL, &local_err);
+ ret = bdrv_fill_options(&options, &filename, &flags, &local_err);
if (local_err) {
goto fail;
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/23] Block layer patches, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 02/23] block: Drop drv parameter from bdrv_open(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 05/23] block: Drop bdrv_find_whitelisted_format(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 03/23] block: Drop drv parameter from bdrv_open_inherit(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 01/23] block: Always pass NULL as drv for bdrv_open(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 04/23] block: Drop drv parameter from bdrv_fill_options(),
Kevin Wolf <=
- [Qemu-devel] [PULL 08/23] qemu-io: Remove duplicate 'open' error message, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 07/23] block: Allow specifying driver-specific options to reopen, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 09/23] qemu-io: Add command 'reopen', Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 10/23] qcow2: Improve error message, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 12/23] qcow2: Move qcow2_update_options() call up, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 11/23] qcow2: Factor out qcow2_update_options(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 06/23] qcow2: Rename BDRVQcowState to BDRVQcow2State, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 15/23] qcow2: Fix memory leak in qcow2_update_options() error path, Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 13/23] qcow2: Move rest of option handling to qcow2_update_options(), Kevin Wolf, 2015/09/11
- [Qemu-devel] [PULL 14/23] qcow2: Leave s unchanged on qcow2_update_options() failure, Kevin Wolf, 2015/09/11