[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/28] block: Add options QDict to bdrv_open_common(
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 04/28] block: Add options QDict to bdrv_open_common() |
Date: |
Fri, 15 Mar 2013 16:14:01 +0100 |
From: Kevin Wolf <address@hidden>
The options are passed down to the block drivers, which are supposed to
remove all options they have processed. Anything that is left over in
the end is an unknown option and results in an error.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index 761ea86..0ab164d 100644
--- a/block.c
+++ b/block.c
@@ -665,15 +665,18 @@ static int bdrv_open_flags(BlockDriverState *bs, int
flags)
/*
* Common part for opening disk images and files
+ *
+ * Removes all processed options from *options.
*/
static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file,
- const char *filename,
+ const char *filename, QDict *options,
int flags, BlockDriver *drv)
{
int ret, open_flags;
assert(drv != NULL);
assert(bs->file == NULL);
+ assert(options == NULL || bs->options != options);
trace_bdrv_open_common(bs, filename, flags, drv->format_name);
@@ -710,7 +713,7 @@ static int bdrv_open_common(BlockDriverState *bs,
BlockDriverState *file,
} else {
assert(file != NULL);
bs->file = file;
- ret = drv->bdrv_open(bs, NULL, open_flags);
+ ret = drv->bdrv_open(bs, options, open_flags);
}
if (ret < 0) {
@@ -752,7 +755,7 @@ int bdrv_file_open(BlockDriverState **pbs, const char
*filename, int flags)
}
bs = bdrv_new("");
- ret = bdrv_open_common(bs, NULL, filename, flags, drv);
+ ret = bdrv_open_common(bs, NULL, filename, NULL, flags, drv);
if (ret < 0) {
bdrv_delete(bs);
return ret;
@@ -821,6 +824,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename,
QDict *options,
}
bs->options = options;
+ options = qdict_clone_shallow(options);
/* For snapshot=on, create a temporary qcow2 overlay */
if (flags & BDRV_O_SNAPSHOT) {
@@ -903,7 +907,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename,
QDict *options,
}
/* Open the image */
- ret = bdrv_open_common(bs, file, filename, flags, drv);
+ ret = bdrv_open_common(bs, file, filename, options, flags, drv);
if (ret < 0) {
goto unlink_and_fail;
}
@@ -917,11 +921,22 @@ int bdrv_open(BlockDriverState *bs, const char *filename,
QDict *options,
if ((flags & BDRV_O_NO_BACKING) == 0) {
ret = bdrv_open_backing_file(bs);
if (ret < 0) {
- bdrv_close(bs);
- return ret;
+ goto close_and_fail;
}
}
+ /* Check if any unknown options were used */
+ if (qdict_size(options) != 0) {
+ const QDictEntry *entry = qdict_first(options);
+ qerror_report(ERROR_CLASS_GENERIC_ERROR, "Block format '%s' used by "
+ "device '%s' doesn't support the option '%s'",
+ drv->format_name, bs->device_name, entry->key);
+
+ ret = -EINVAL;
+ goto close_and_fail;
+ }
+ QDECREF(options);
+
if (!bdrv_key_required(bs)) {
bdrv_dev_change_media_cb(bs, true);
}
@@ -942,8 +957,13 @@ unlink_and_fail:
}
fail:
QDECREF(bs->options);
+ QDECREF(options);
bs->options = NULL;
+ return ret;
+close_and_fail:
+ bdrv_close(bs);
+ QDECREF(options);
return ret;
}
--
1.8.1.4
- [Qemu-devel] [PULL 00/28] Block patches, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 04/28] block: Add options QDict to bdrv_open_common(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 03/28] Add qdict_clone_shallow(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 05/28] qemu-option: Add qemu_opts_absorb_qdict(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 08/28] qcow2: Allow lazy refcounts to be enabled on the command line, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 02/28] block: Add options QDict to bdrv_open() prototype, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 01/28] block: Add options QDict to .bdrv_open(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 10/28] qcow2: flush refcount cache correctly in qcow2_write_snapshots(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 11/28] qcow2: set L2 cache dependency in qcow2_alloc_bytes(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 09/28] qcow2: flush refcount cache correctly in alloc_refcount_block(), Stefan Hajnoczi, 2013/03/15