diff options
| author | Ashijeet Acharya <ashijeetacharya@gmail.com> | 2016-10-25 18:34:00 +0530 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-10-31 16:49:13 +0100 |
| commit | 1059f1bb42928e925f7dacb85da157a6e99c20ea (patch) | |
| tree | c49fa00686c035d99e4d3eb6816778e97374a8f3 | |
| parent | 0da5b8ef5d81c3fab0ba560c7c2140da27309023 (diff) | |
block/ssh: Use InetSocketAddress options
Drop the use of legacy options in favour of the InetSocketAddress
options.
Signed-off-by: Ashijeet Acharya <ashijeetacharya@gmail.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/ssh.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/block/ssh.c b/block/ssh.c index 20fa9c222b..ca071c569c 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -197,6 +197,7 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) { URI *uri = NULL; QueryParams *qp; + char *port_str; int i; uri = uri_parse(filename); @@ -229,11 +230,11 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) qdict_put(options, "user", qstring_from_str(uri->user)); } - qdict_put(options, "host", qstring_from_str(uri->server)); + qdict_put(options, "server.host", qstring_from_str(uri->server)); - if (uri->port) { - qdict_put(options, "port", qint_from_int(uri->port)); - } + port_str = g_strdup_printf("%d", uri->port ?: 22); + qdict_put(options, "server.port", qstring_from_str(port_str)); + g_free(port_str); qdict_put(options, "path", qstring_from_str(uri->path)); |