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

block: Simplify append_open_options() 



This function returns a BDS's driver-specific options, excluding also
those from its children. Since we have just removed all children
options from bs->options there's no need to do this last step.

We allow references to children, though ("backing": "node0"), so those
we still have to remove.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 4c8350fe

block.c

+2 −5
Original line number Diff line number Diff line
@@ -5150,16 +5150,13 @@ static bool append_open_options(QDict *d, BlockDriverState *bs) 
    QemuOptDesc *desc;

    BdrvChild *child;

    bool found_any = false;

    const char *p;



    for (entry = qdict_first(bs->options); entry;

         entry = qdict_next(bs->options, entry))

    {

        /* Exclude options for children */

        /* Exclude node-name references to children */

        QLIST_FOREACH(child, &bs->children, next) {

            if (strstart(qdict_entry_key(entry), child->name, &p)

                && (!*p || *p == '.'))

            {

            if (!strcmp(entry->key, child->name)) {

                break;

            }

        }