Message ID | 20221021090922.170074-14-lvivier@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | qapi: net: add unix socket type support to netdev backend | expand |
On 21/10/22 11:09, 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> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > include/qemu/sockets.h | 2 +- > monitor/hmp-cmds.c | 23 +---------------------- > util/qemu-sockets.c | 20 ++++++++++++++++++++ > 3 files changed, 22 insertions(+), 23 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Hi On Fri, Oct 21, 2022 at 2:03 PM Laurent Vivier <lvivier@redhat.com> 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. > Tbh, as we are renaming functions here, I would follow good glib/C conventions and use the type name in lower case as prefix. I would also not use "URI", which should be reserved for RFC3986 compliant forms. So instead, I'd suggest to rename to: char *socket_address_to_string(SocketAddress *addr); SocketAddress *socket_address_new_from_string(const char *str, Error **errp) my 2c > Signed-off-by: Laurent Vivier <lvivier@redhat.com> > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > 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 db4bedb6fa20..214058d8e307 100644 > --- a/include/qemu/sockets.h > +++ b/include/qemu/sockets.h > @@ -58,6 +58,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); > @@ -141,5 +142,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 bab86c5537e1..01b789a79e62 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -199,27 +199,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; > @@ -382,7 +361,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) > { > -- > 2.37.3 > > >
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index db4bedb6fa20..214058d8e307 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -58,6 +58,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); @@ -141,5 +142,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 bab86c5537e1..01b789a79e62 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -199,27 +199,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; @@ -382,7 +361,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) {