From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1btrg7-0004PU-Qw for qemu-devel@nongnu.org; Tue, 11 Oct 2016 03:40:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1btrg6-0006fS-Rq for qemu-devel@nongnu.org; Tue, 11 Oct 2016 03:40:47 -0400 From: Ashijeet Acharya Date: Tue, 11 Oct 2016 13:07:16 +0530 Message-Id: <1476171437-11830-4-git-send-email-ashijeetacharya@gmail.com> In-Reply-To: <1476171437-11830-1-git-send-email-ashijeetacharya@gmail.com> References: <1476171437-11830-1-git-send-email-ashijeetacharya@gmail.com> Subject: [Qemu-devel] [PATCH 3/4] block/ssh: Use InetSocketAddress options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com Cc: rjones@redhat.com, jcody@redhat.com, eblake@redhat.com, mreitz@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, Ashijeet Acharya Drop the use of legacy options in favour of the InetSocketAddress options. Signed-off-by: Ashijeet Acharya --- block/ssh.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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: -- 2.6.2