diff mbox

[3/4] block/ssh: Use InetSocketAddress options

Message ID 1476171437-11830-4-git-send-email-ashijeetacharya@gmail.com
State New
Headers show

Commit Message

Ashijeet Acharya Oct. 11, 2016, 7:37 a.m. UTC 
Drop the use of legacy options in favour of the InetSocketAddress
options.

Signed-off-by: Ashijeet Acharya <ashijeetacharya@gmail.com>
---
 block/ssh.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/block/ssh.c b/block/ssh.c
index 702871a..399ed60 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -198,6 +198,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);
@@ -230,11 +231,10 @@  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));
 
     qdict_put(options, "path", qstring_from_str(uri->path));
 
@@ -250,6 +250,7 @@  static int parse_uri(const char *filename, QDict *options, Error **errp)
 
     query_params_free(qp);
     uri_free(uri);
+    g_free(port_str);
     return 0;
 
  err: