Commit a600aadd authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

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: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 50196d7a

block.c

+1 −12
Original line number Diff line number Diff line
@@ -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;