[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/5] block/ssh: Use InetSocketAddress options
From: |
Ashijeet Acharya |
Subject: |
[Qemu-devel] [PATCH v3 4/5] block/ssh: Use InetSocketAddress options |
Date: |
Mon, 17 Oct 2016 23:02:14 +0530 |
Drop the use of legacy options in favour of the InetSocketAddress
options.
Signed-off-by: Ashijeet Acharya <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/ssh.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/ssh.c b/block/ssh.c
index 7963b48..9b693f6 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -199,6 +199,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);
@@ -231,11 +232,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));
--
2.6.2
- [Qemu-devel] [PATCH v3 0/5] Allow blockdev-add for SSH, Ashijeet Acharya, 2016/10/17
- [Qemu-devel] [PATCH v3 2/5] util/qemu-sockets: Make inet_connect_saddr() public, Ashijeet Acharya, 2016/10/17
- [Qemu-devel] [PATCH v3 1/5] block/ssh: Add ssh_has_filename_options_conflict(), Ashijeet Acharya, 2016/10/17
- [Qemu-devel] [PATCH v3 3/5] block/ssh: Add InetSocketAddress and accept it, Ashijeet Acharya, 2016/10/17
- [Qemu-devel] [PATCH v3 4/5] block/ssh: Use InetSocketAddress options,
Ashijeet Acharya <=
- [Qemu-devel] [PATCH v3 5/5] qapi: allow blockdev-add for ssh, Ashijeet Acharya, 2016/10/17
- Re: [Qemu-devel] [PATCH v3 0/5] Allow blockdev-add for SSH, no-reply, 2016/10/17