ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alberto Garcia 2018-09-06 12:37:04 +03:00 committed by Kevin Wolf
parent 50196d7a7c
commit a600aaddc3
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
block.c
View File

@ -5150,23 +5150,12 @@ static bool append_open_options(QDict *d, BlockDriverState *bs)
{ {
const QDictEntry *entry; const QDictEntry *entry;
QemuOptDesc *desc; QemuOptDesc *desc;
BdrvChild *child;
bool found_any = false; bool found_any = false;
for (entry = qdict_first(bs->options); entry; for (entry = qdict_first(bs->options); entry;
entry = qdict_next(bs->options, entry)) entry = qdict_next(bs->options, entry))
{ {
/* Exclude node-name references to children */ /* Exclude all non-driver-specific options */
QLIST_FOREACH(child, &bs->children, next) {
if (!strcmp(entry->key, child->name)) {
break;
}
}
if (child) {
continue;
}
/* And exclude all non-driver-specific options */
for (desc = bdrv_runtime_opts.desc; desc->name; desc++) { for (desc = bdrv_runtime_opts.desc; desc->name; desc++) {
if (!strcmp(qdict_entry_key(entry), desc->name)) { if (!strcmp(qdict_entry_key(entry), desc->name)) {
break; break;