Commit 21205c7c authored by Max Reitz's avatar Max Reitz
Browse files

block/ssh: Implement .bdrv_dirname() 



ssh_bdrv_dirname() is basically the generic bdrv_dirname(), except it
takes care not to silently chop off any query string (i.e.,
host_key_check).

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Tested-by: default avatarRichard W.M. Jones <rjones@redhat.com>
Message-id: 20190225190828.17726-3-mreitz@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent b8c1f901

block/ssh.c

+21 −0
Original line number Diff line number Diff line
@@ -1283,6 +1283,26 @@ static void ssh_refresh_filename(BlockDriverState *bs) 
    }

}



static char *ssh_bdrv_dirname(BlockDriverState *bs, Error **errp)

{

    if (qdict_haskey(bs->full_open_options, "host_key_check")) {

        /*

         * We cannot generate a simple prefix if we would have to

         * append a query string.

         */

        error_setg(errp,

                   "Cannot generate a base directory with host_key_check set");

        return NULL;

    }



    if (bs->exact_filename[0] == '\0') {

        error_setg(errp, "Cannot generate a base directory for this ssh node");

        return NULL;

    }



    return path_combine(bs->exact_filename, "");

}



static const char *const ssh_strong_runtime_opts[] = {

    "host",

    "port",
@@ -1310,6 +1330,7 @@ static BlockDriver bdrv_ssh = { 
    .bdrv_co_truncate             = ssh_co_truncate,

    .bdrv_co_flush_to_disk        = ssh_co_flush,

    .bdrv_refresh_filename        = ssh_refresh_filename,

    .bdrv_dirname                 = ssh_bdrv_dirname,

    .create_opts                  = &ssh_create_opts,

    .strong_runtime_opts          = ssh_strong_runtime_opts,

};