[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v8 11/14] qemu-sockets: move and rename SocketAddress_to_str(
From: |
David Gibson |
Subject: |
Re: [PATCH v8 11/14] qemu-sockets: move and rename SocketAddress_to_str() |
Date: |
Wed, 14 Sep 2022 15:23:42 +1000 |
On Tue, Sep 13, 2022 at 08:39:57AM +0200, Laurent Vivier wrote:
> Rename SocketAddress_to_str() to socket_uri() and move it to
> util/qemu-sockets.c close to socket_parse().
>
> socket_uri() generates a string from a SocketAddress while
> socket_parse() generates a SocketAddress from a string.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> include/qemu/sockets.h | 2 +-
> monitor/hmp-cmds.c | 23 +----------------------
> util/qemu-sockets.c | 20 ++++++++++++++++++++
> 3 files changed, 22 insertions(+), 23 deletions(-)
>
> diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
> index 47194b9732f8..e5a06d2e3729 100644
> --- a/include/qemu/sockets.h
> +++ b/include/qemu/sockets.h
> @@ -40,6 +40,7 @@ NetworkAddressFamily inet_netfamily(int family);
> int unix_listen(const char *path, Error **errp);
> int unix_connect(const char *path, Error **errp);
>
> +char *socket_uri(SocketAddress *addr);
> SocketAddress *socket_parse(const char *str, Error **errp);
> int socket_connect(SocketAddress *addr, Error **errp);
> int socket_listen(SocketAddress *addr, int num, Error **errp);
> @@ -123,5 +124,4 @@ SocketAddress *socket_address_flatten(SocketAddressLegacy
> *addr);
> * Return 0 on success.
> */
> int socket_address_parse_named_fd(SocketAddress *addr, Error **errp);
> -
> #endif /* QEMU_SOCKETS_H */
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index c6cd6f91dde6..cb35059c2d45 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -197,27 +197,6 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict)
> qapi_free_MouseInfoList(mice_list);
> }
>
> -static char *SocketAddress_to_str(SocketAddress *addr)
> -{
> - switch (addr->type) {
> - case SOCKET_ADDRESS_TYPE_INET:
> - return g_strdup_printf("tcp:%s:%s",
> - addr->u.inet.host,
> - addr->u.inet.port);
> - case SOCKET_ADDRESS_TYPE_UNIX:
> - return g_strdup_printf("unix:%s",
> - addr->u.q_unix.path);
> - 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",
> - addr->u.vsock.cid,
> - addr->u.vsock.port);
> - default:
> - return g_strdup("unknown address type");
> - }
> -}
> -
> void hmp_info_migrate(Monitor *mon, const QDict *qdict)
> {
> MigrationInfo *info;
> @@ -380,7 +359,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
> monitor_printf(mon, "socket address: [\n");
>
> for (addr = info->socket_address; addr; addr = addr->next) {
> - char *s = SocketAddress_to_str(addr->value);
> + char *s = socket_uri(addr->value);
> monitor_printf(mon, "\t%s\n", s);
> g_free(s);
> }
> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
> index 83f4bd6fd211..9f6f655fd526 100644
> --- a/util/qemu-sockets.c
> +++ b/util/qemu-sockets.c
> @@ -1077,6 +1077,26 @@ int unix_connect(const char *path, Error **errp)
> return sock;
> }
>
> +char *socket_uri(SocketAddress *addr)
> +{
> + switch (addr->type) {
> + case SOCKET_ADDRESS_TYPE_INET:
> + return g_strdup_printf("tcp:%s:%s",
> + addr->u.inet.host,
> + addr->u.inet.port);
> + case SOCKET_ADDRESS_TYPE_UNIX:
> + return g_strdup_printf("unix:%s",
> + addr->u.q_unix.path);
> + 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",
> + addr->u.vsock.cid,
> + addr->u.vsock.port);
> + default:
> + return g_strdup("unknown address type");
> + }
> +}
>
> SocketAddress *socket_parse(const char *str, Error **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
- Re: [PATCH v8 05/14] qapi: net: add stream and dgram netdevs, (continued)
- [PATCH v8 10/14] net: dgram: add unix socket, Laurent Vivier, 2022/09/13
- [PATCH v8 09/14] net: dgram: move mcast specific code from net_socket_fd_init_dgram(), Laurent Vivier, 2022/09/13
- [PATCH v8 14/14] tests/qtest: netdev: test stream and dgram backends, Laurent Vivier, 2022/09/13
- [PATCH v8 08/14] net: dgram: make dgram_dst generic, Laurent Vivier, 2022/09/13
- [PATCH v8 13/14] net: stream: move to QIO, Laurent Vivier, 2022/09/13
- [PATCH v8 11/14] qemu-sockets: move and rename SocketAddress_to_str(), Laurent Vivier, 2022/09/13
- [PATCH v8 07/14] net: stream: add unix socket, Laurent Vivier, 2022/09/13
- [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