[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/34] qemu-sockets: introduce socket_address_parse_named_fd()
From: |
Eric Blake |
Subject: |
[PULL 07/34] qemu-sockets: introduce socket_address_parse_named_fd() |
Date: |
Tue, 15 Jun 2021 15:47:29 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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>
Message-Id: <20210610100802.5888-6-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: comment tweak]
Signed-off-by: Eric Blake <eblake@redhat.com>
---
include/qemu/sockets.h | 11 +++++++++++
util/qemu-sockets.c | 19 +++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 7d1f8135767d..0c34bf23987e 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -111,4 +111,15 @@ SocketAddress *socket_remote_address(int fd, Error **errp);
*/
SocketAddress *socket_address_flatten(SocketAddressLegacy *addr);
+/**
+ * socket_address_parse_named_fd:
+ *
+ * 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
index c415c342c12b..080a240b74ee 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -1164,6 +1164,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;
--
2.31.1
- [PULL 00/34] NBD patches for 2021-06-15, Eric Blake, 2021/06/15
- [PULL 03/34] co-queue: drop extra coroutine_fn marks, Eric Blake, 2021/06/15
- [PULL 02/34] tests: cover aio_co_enter from a worker thread without BQL taken, Eric Blake, 2021/06/15
- [PULL 04/34] block/nbd: fix channel object leak, Eric Blake, 2021/06/15
- [PULL 01/34] async: the main AioContext is only "current" if under the BQL, Eric Blake, 2021/06/15
- [PULL 05/34] block/nbd: fix how state is cleared on nbd_open() failure paths, Eric Blake, 2021/06/15
- [PULL 07/34] qemu-sockets: introduce socket_address_parse_named_fd(),
Eric Blake <=
- [PULL 06/34] block/nbd: connect_thread_func(): do qio_channel_set_delay(false), Eric Blake, 2021/06/15
- [PULL 10/34] block/nbd: nbd_client_handshake(): fix leak of s->ioc, Eric Blake, 2021/06/15
- [PULL 09/34] block/nbd: ensure ->connection_thread is always valid, Eric Blake, 2021/06/15
- [PULL 08/34] block/nbd: call socket_address_parse_named_fd() in advance, Eric Blake, 2021/06/15
- [PULL 11/34] block/nbd: BDRVNBDState: drop unused connect_err and connect_status, Eric Blake, 2021/06/15
- [PULL 12/34] block/nbd: simplify waking of nbd_co_establish_connection(), Eric Blake, 2021/06/15
- [PULL 13/34] block/nbd: drop thr->state, Eric Blake, 2021/06/15
- [PULL 14/34] block/nbd: bs-independent interface for nbd_co_establish_connection(), Eric Blake, 2021/06/15
- [PULL 15/34] block/nbd: make nbd_co_establish_connection_cancel() bs-independent, Eric Blake, 2021/06/15
- [PULL 17/34] block/nbd: introduce nbd_client_connection_new(), Eric Blake, 2021/06/15