diff mbox series

[v4,05/32] qemu-sockets: introduce socket_address_parse_named_fd()

Message ID 20210610100802.5888-6-vsementsov@virtuozzo.com
State New
Headers show
Series block/nbd: rework client connection | expand

Commit Message

Vladimir Sementsov-Ogievskiy June 10, 2021, 10:07 a.m. UTC 
Add function that transforms named fd inside SocketAddress structure
into number representation. This way it may be then used in a context
where current monitor is not available.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 include/qemu/sockets.h | 14 ++++++++++++++
 util/qemu-sockets.c    | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+)

Comments

Eric Blake June 11, 2021, 1:22 p.m. UTC | #1 
On Thu, Jun 10, 2021 at 01:07:35PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> Add function that transforms named fd inside SocketAddress structure
> into number representation. This way it may be then used in a context
> where current monitor is not available.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>  include/qemu/sockets.h | 14 ++++++++++++++
>  util/qemu-sockets.c    | 19 +++++++++++++++++++
>  2 files changed, 33 insertions(+)
> 
> diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
> index 7d1f813576..1f4f18a44a 100644
> --- a/include/qemu/sockets.h
> +++ b/include/qemu/sockets.h
> @@ -111,4 +111,18 @@ SocketAddress *socket_remote_address(int fd, Error **errp);
>   */
>  SocketAddress *socket_address_flatten(SocketAddressLegacy *addr);
>  
> +/**
> + * socket_address_parse_named_fd:
> + *
> + * Modify @addr, replacing named fd by corresponding number.
> + *
> + * Parsing named fd (by sockget_get_fd) is not possible in context where
> + * current monitor is not available. So, SocketAddress user may first call
> + * socket_parse_named_fd() to parse named fd in advance, and then pass @addr to
> + * the context where monitor is not available.

2 different wrong function names, and reads awkwardly.  How about this
shorter variant:

Modify @addr, replacing a named fd by its corresponding number.
Needed for callers that plan to pass @addr to a context where the
current monitor is not available.

> + *
> + * Return 0 on success.
> + */
> +int socket_address_parse_named_fd(SocketAddress *addr, Error **errp);
> +
>  #endif /* QEMU_SOCKETS_H */
> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c

But the code looks good.

Reviewed-by: Eric Blake <eblake@redhat.com>
Vladimir Sementsov-Ogievskiy June 11, 2021, 2:10 p.m. UTC | #2 
11.06.2021 16:22, Eric Blake wrote:
> On Thu, Jun 10, 2021 at 01:07:35PM +0300, Vladimir Sementsov-Ogievskiy wrote:
>> Add function that transforms named fd inside SocketAddress structure
>> into number representation. This way it may be then used in a context
>> where current monitor is not available.
>>
>> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
>> ---
>>   include/qemu/sockets.h | 14 ++++++++++++++
>>   util/qemu-sockets.c    | 19 +++++++++++++++++++
>>   2 files changed, 33 insertions(+)
>>
>> diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
>> index 7d1f813576..1f4f18a44a 100644
>> --- a/include/qemu/sockets.h
>> +++ b/include/qemu/sockets.h
>> @@ -111,4 +111,18 @@ SocketAddress *socket_remote_address(int fd, Error **errp);
>>    */
>>   SocketAddress *socket_address_flatten(SocketAddressLegacy *addr);
>>   
>> +/**
>> + * socket_address_parse_named_fd:
>> + *
>> + * Modify @addr, replacing named fd by corresponding number.
>> + *
>> + * Parsing named fd (by sockget_get_fd) is not possible in context where
>> + * current monitor is not available. So, SocketAddress user may first call
>> + * socket_parse_named_fd() to parse named fd in advance, and then pass @addr to
>> + * the context where monitor is not available.
> 
> 2 different wrong function names, and reads awkwardly.  How about this
> shorter variant:
> 
> Modify @addr, replacing a named fd by its corresponding number.
> Needed for callers that plan to pass @addr to a context where the
> current monitor is not available.

A lot better, thanks!

> 
>> + *
>> + * Return 0 on success.
>> + */
>> +int socket_address_parse_named_fd(SocketAddress *addr, Error **errp);
>> +
>>   #endif /* QEMU_SOCKETS_H */
>> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
> 
> But the code looks good.

Somehow, C is simpler for me than English )

> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
>
diff mbox series

Patch

diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 7d1f813576..1f4f18a44a 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -111,4 +111,18 @@  SocketAddress *socket_remote_address(int fd, Error **errp);
  */
 SocketAddress *socket_address_flatten(SocketAddressLegacy *addr);
 
+/**
+ * socket_address_parse_named_fd:
+ *
+ * Modify @addr, replacing named fd by corresponding number.
+ *
+ * Parsing named fd (by sockget_get_fd) is not possible in context where
+ * current monitor is not available. So, SocketAddress user may first call
+ * socket_parse_named_fd() to parse named fd in advance, and then pass @addr to
+ * the context where monitor is not available.
+ *
+ * Return 0 on success.
+ */
+int socket_address_parse_named_fd(SocketAddress *addr, Error **errp);
+
 #endif /* QEMU_SOCKETS_H */
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 2463c49773..86316b6314 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -1141,6 +1141,25 @@  static int socket_get_fd(const char *fdstr, Error **errp)
     return fd;
 }
 
+int socket_address_parse_named_fd(SocketAddress *addr, Error **errp)
+{
+    int fd;
+
+    if (addr->type != SOCKET_ADDRESS_TYPE_FD) {
+        return 0;
+    }
+
+    fd = socket_get_fd(addr->u.fd.str, errp);
+    if (fd < 0) {
+        return fd;
+    }
+
+    g_free(addr->u.fd.str);
+    addr->u.fd.str = g_strdup_printf("%d", fd);
+
+    return 0;
+}
+
 int socket_connect(SocketAddress *addr, Error **errp)
 {
     int fd;