From: David Gibson <david@gibson.dropbear.id.au>
To: Laurent Vivier <lvivier@redhat.com>
Cc: qemu-devel@nongnu.org, "Jason Wang" <jasowang@redhat.com>,
"Greg Kurz" <groug@kaod.org>, "Thomas Huth" <thuth@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>
Subject: Re: [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent
Date: Wed, 28 Sep 2022 16:23:54 +1000 [thread overview]
Message-ID: <YzPoeq99KNl0XNGJ@yekko> (raw)
In-Reply-To: <20220926195048.487915-14-lvivier@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 2155 bytes --]
On Mon, Sep 26, 2022 at 09:50:45PM +0200, Laurent Vivier wrote:
> To be consistent with socket_uri(), add 'tcp:' prefix for inet type in
> socket_parse(), by default socket_parse() use tcp when no prefix is
> provided (format is host:port).
>
> In socket_uri(), use 'vsock:' prefix for vsock type rather than 'tcp:'
> because it makes a vsock address look like an inet address with CID
> misinterpreted as host.
> Goes back to commit 9aca82ba31 "migration: Create socket-address parameter"
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> util/qemu-sockets.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
> index 9f6f655fd526..a9926af714c4 100644
> --- a/util/qemu-sockets.c
> +++ b/util/qemu-sockets.c
> @@ -1090,7 +1090,7 @@ char *socket_uri(SocketAddress *addr)
> case SOCKET_ADDRESS_TYPE_FD:
> return g_strdup_printf("fd:%s", addr->u.fd.str);
> case SOCKET_ADDRESS_TYPE_VSOCK:
> - return g_strdup_printf("tcp:%s:%s",
> + return g_strdup_printf("vsock:%s:%s",
> addr->u.vsock.cid,
> addr->u.vsock.port);
> default:
> @@ -1124,6 +1124,11 @@ SocketAddress *socket_parse(const char *str, Error **errp)
> if (vsock_parse(&addr->u.vsock, str + strlen("vsock:"), errp)) {
> goto fail;
> }
> + } else if (strstart(str, "tcp:", NULL)) {
> + addr->type = SOCKET_ADDRESS_TYPE_INET;
> + if (inet_parse(&addr->u.inet, str + strlen("tcp:"), errp)) {
> + goto fail;
> + }
> } else {
> addr->type = SOCKET_ADDRESS_TYPE_INET;
> if (inet_parse(&addr->u.inet, str, errp)) {
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2022-09-28 6:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 01/16] net: introduce convert_host_port() Laurent Vivier
2022-09-28 4:55 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 02/16] net: remove the @errp argument of net_client_inits() Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 03/16] net: simplify net_client_parse() error management Laurent Vivier
2022-09-28 4:56 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 04/16] qapi: net: introduce a way to bypass qemu_opts_parse_noisily() Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 05/16] qapi: net: add stream and dgram netdevs Laurent Vivier
2022-09-27 9:18 ` Markus Armbruster
2022-09-28 5:55 ` David Gibson
2022-10-05 10:08 ` Laurent Vivier
2022-10-06 0:37 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 06/16] net: socket: Don't ignore EINVAL on netdev socket connection Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 07/16] net: stream: " Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 08/16] net: stream: add unix socket Laurent Vivier
2022-09-28 6:12 ` David Gibson
2022-10-05 13:38 ` Laurent Vivier
2022-10-06 0:39 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 09/16] net: dgram: make dgram_dst generic Laurent Vivier
2022-09-28 6:17 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 10/16] net: dgram: move mcast specific code from net_socket_fd_init_dgram() Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 11/16] net: dgram: add unix socket Laurent Vivier
2022-09-28 6:22 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 12/16] qemu-sockets: move and rename SocketAddress_to_str() Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent Laurent Vivier
2022-09-28 6:23 ` David Gibson [this message]
2022-09-26 19:50 ` [PATCH v9 14/16] net: stream: move to QIO to enable additional parameters Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends Laurent Vivier
2022-09-27 10:01 ` Thomas Huth
2022-09-26 19:50 ` [PATCH v9 16/16] net: stream: add QAPI events to report connection state Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YzPoeq99KNl0XNGJ@yekko \
--to=david@gibson.dropbear.id.au \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=groug@kaod.org \
--cc=jasowang@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).