[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse(
From: |
David Gibson |
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 |
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
signature.asc
Description: PGP signature
- [PATCH v9 05/16] qapi: net: add stream and dgram netdevs, (continued)
- [PATCH v9 05/16] qapi: net: add stream and dgram netdevs, Laurent Vivier, 2022/09/26
- [PATCH v9 03/16] net: simplify net_client_parse() error management, Laurent Vivier, 2022/09/26
- [PATCH v9 04/16] qapi: net: introduce a way to bypass qemu_opts_parse_noisily(), Laurent Vivier, 2022/09/26
- [PATCH v9 14/16] net: stream: move to QIO to enable additional parameters, Laurent Vivier, 2022/09/26
- [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends, Laurent Vivier, 2022/09/26
- [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent, Laurent Vivier, 2022/09/26
- Re: [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent,
David Gibson <=
- [PATCH v9 11/16] net: dgram: add unix socket, Laurent Vivier, 2022/09/26
- [PATCH v9 01/16] net: introduce convert_host_port(), Laurent Vivier, 2022/09/26
- [PATCH v9 09/16] net: dgram: make dgram_dst generic, Laurent Vivier, 2022/09/26
- [PATCH v9 12/16] qemu-sockets: move and rename SocketAddress_to_str(), Laurent Vivier, 2022/09/26
- [PATCH v9 10/16] net: dgram: move mcast specific code from net_socket_fd_init_dgram(), Laurent Vivier, 2022/09/26
- [PATCH v9 16/16] net: stream: add QAPI events to report connection state, Laurent Vivier, 2022/09/26