Commit c82be42c authored by Kevin Wolf's avatar Kevin Wolf Committed by Jeff Cody
Browse files

nfs: Remove processed options from QDict 



Commit c22a0345 QAPIfied option parsing in the NFS block driver, but
forgot to remove all the options we processed. Therefore, we get an
error in bdrv_open_inherit(), which thinks the remaining options are
invalid. Trying to open an NFS image will result in an error like this:

    Block protocol 'nfs' doesn't support the option 'server.host'

Remove all options from the QDict to make the NFS driver work again.

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-id: 20180516160816.26259-1-kwolf@redhat.com
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent 54b7af43

block/nfs.c

+7 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options, 
    BlockdevOptionsNfs *opts = NULL;

    QObject *crumpled = NULL;

    Visitor *v;

    const QDictEntry *e;

    Error *local_err = NULL;



    crumpled = qdict_crumple(options, errp);
@@ -574,6 +575,12 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options, 
        return NULL;

    }



    /* Remove the processed options from the QDict (the visitor processes

     * _all_ options in the QDict) */

    while ((e = qdict_first(options))) {

        qdict_del(options, e->key);

    }



    return opts;

}