[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v8 12/14] qemu-sockets: update socket_uri() and socket_parse(
From: |
Dr. David Alan Gilbert |
Subject: |
Re: [PATCH v8 12/14] qemu-sockets: update socket_uri() and socket_parse() to be consistent |
Date: |
Wed, 14 Sep 2022 20:06:49 +0100 |
User-agent: |
Mutt/2.2.7 (2022-08-07) |
* Laurent Vivier (lvivier@redhat.com) 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>
Yeh I think that's safer than the last version for migrate URIs
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> 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)) {
> --
> 2.37.3
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
- [PATCH v8 01/14] net: introduce convert_host_port(), (continued)
- [PATCH v8 01/14] net: introduce convert_host_port(), Laurent Vivier, 2022/09/13
- [PATCH v8 03/14] net: simplify net_client_parse() error management, Laurent Vivier, 2022/09/13
- [PATCH v8 06/14] net: stream: Don't ignore EINVAL on netdev socket connection, Laurent Vivier, 2022/09/13
- [PATCH v8 02/14] net: remove the @errp argument of net_client_inits(), Laurent Vivier, 2022/09/13
- [PATCH v8 12/14] qemu-sockets: update socket_uri() and socket_parse() to be consistent, Laurent Vivier, 2022/09/13
- [PATCH v8 04/14] qapi: net: introduce a way to bypass qemu_opts_parse_noisily(), Laurent Vivier, 2022/09/13
- Re: [PATCH v8 00/14] qapi: net: add unix socket type support to netdev backend, Stefano Brivio, 2022/09/13