diff options
| author | Alberto Garcia <berto@igalia.com> | 2018-09-06 12:37:04 +0300 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-10-01 12:51:12 +0200 |
| commit | a600aaddc3894618b8a0a20a084dd0515c26f4d5 (patch) | |
| tree | 7d1a625447fa97287bc2a00b17d7c936696194f8 | |
| parent | 50196d7a7c73133a6a6bf484571fb8f5daf7f104 (diff) | |
| download | focaccia-qemu-a600aaddc3894618b8a0a20a084dd0515c26f4d5.tar.gz focaccia-qemu-a600aaddc3894618b8a0a20a084dd0515c26f4d5.zip | |
block: Don't look for child references in append_open_options()
In the previous patch we removed child references from bs->options, so there's no need to look for them here anymore. Signed-off-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/block.c b/block.c index db71ea5b9a..98aca56785 100644 --- a/block.c +++ b/block.c @@ -5150,23 +5150,12 @@ static bool append_open_options(QDict *d, BlockDriverState *bs) { const QDictEntry *entry; QemuOptDesc *desc; - BdrvChild *child; bool found_any = false; for (entry = qdict_first(bs->options); entry; entry = qdict_next(bs->options, entry)) { - /* Exclude node-name references to children */ - QLIST_FOREACH(child, &bs->children, next) { - if (!strcmp(entry->key, child->name)) { - break; - } - } - if (child) { - continue; - } - - /* And exclude all non-driver-specific options */ + /* Exclude all non-driver-specific options */ for (desc = bdrv_runtime_opts.desc; desc->name; desc++) { if (!strcmp(qdict_entry_key(entry), desc->name)) { break; |