Commit 89dbe180 authored by Ashijeet Acharya's avatar Ashijeet Acharya Committed by Kevin Wolf
Browse files

block/ssh: Add ssh_has_filename_options_conflict() 



We have 5 options plus ("server") option which is added in the next
patch that conflict with specifying a SSH filename. We need to iterate
over all the options to check whether its key has an "server." prefix.

This iteration will help us adding the new option "server" easily.

Signed-off-by: default avatarAshijeet Acharya <ashijeetacharya@gmail.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 0bb11379

block/ssh.c

+21 −6
Original line number Diff line number Diff line
@@ -254,15 +254,30 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) 
    return -EINVAL;

}



static bool ssh_has_filename_options_conflict(QDict *options, Error **errp)

{

    const QDictEntry *qe;



    for (qe = qdict_first(options); qe; qe = qdict_next(options, qe)) {

        if (!strcmp(qe->key, "host") ||

            !strcmp(qe->key, "port") ||

            !strcmp(qe->key, "path") ||

            !strcmp(qe->key, "user") ||

            !strcmp(qe->key, "host_key_check"))

        {

            error_setg(errp, "Option '%s' cannot be used with a file name",

                       qe->key);

            return true;

        }

    }



    return false;

}



static void ssh_parse_filename(const char *filename, QDict *options,

                               Error **errp)

{

    if (qdict_haskey(options, "user") ||

        qdict_haskey(options, "host") ||

        qdict_haskey(options, "port") ||

        qdict_haskey(options, "path") ||

        qdict_haskey(options, "host_key_check")) {

        error_setg(errp, "user, host, port, path, host_key_check cannot be used at the same time as a file option");

    if (ssh_has_filename_options_conflict(options, errp)) {

        return;

    }