[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/15] sockets: New helper socket_address_crumple()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 08/15] sockets: New helper socket_address_crumple() |
Date: |
Mon, 3 Apr 2017 17:33:48 +0200 |
From: Markus Armbruster <address@hidden>
SocketAddress is a simple union, and simple unions are awkward: they
have their variant members wrapped in a "data" object on the wire, and
require additional indirections in C. I intend to limit its use to
existing external interfaces. New ones should use SocketAddressFlat.
I further intend to convert all internal interfaces to
SocketAddressFlat. This helper should go away then.
Signed-off-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
include/qemu/sockets.h | 11 +++++++++++
util/qemu-sockets.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 5f1bab9b3e..7842f6d150 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -119,4 +119,15 @@ SocketAddress *socket_remote_address(int fd, Error **errp);
*/
char *socket_address_to_string(struct SocketAddress *addr, Error **errp);
+/**
+ * socket_address_crumple:
+ * @addr_flat: the socket address to crumple
+ *
+ * Convert SocketAddressFlat to SocketAddress. Caller is responsible
+ * for freeing with qapi_free_SocketAddress().
+ *
+ * Returns: the argument converted to SocketAddress.
+ */
+SocketAddress *socket_address_crumple(SocketAddressFlat *addr_flat);
+
#endif /* QEMU_SOCKETS_H */
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 4ae37bd2a2..21442c30dc 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -25,6 +25,7 @@
#include "qapi/error.h"
#include "qemu/sockets.h"
#include "qemu/main-loop.h"
+#include "qapi/clone-visitor.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "qapi-visit.h"
@@ -1341,3 +1342,34 @@ char *socket_address_to_string(struct SocketAddress
*addr, Error **errp)
}
return buf;
}
+
+SocketAddress *socket_address_crumple(SocketAddressFlat *addr_flat)
+{
+ SocketAddress *addr = g_new(SocketAddress, 1);
+
+ switch (addr_flat->type) {
+ case SOCKET_ADDRESS_FLAT_TYPE_INET:
+ addr->type = SOCKET_ADDRESS_KIND_INET;
+ addr->u.inet.data = QAPI_CLONE(InetSocketAddress,
+ &addr_flat->u.inet);
+ break;
+ case SOCKET_ADDRESS_FLAT_TYPE_UNIX:
+ addr->type = SOCKET_ADDRESS_KIND_UNIX;
+ addr->u.q_unix.data = QAPI_CLONE(UnixSocketAddress,
+ &addr_flat->u.q_unix);
+ break;
+ case SOCKET_ADDRESS_FLAT_TYPE_VSOCK:
+ addr->type = SOCKET_ADDRESS_KIND_VSOCK;
+ addr->u.vsock.data = QAPI_CLONE(VsockSocketAddress,
+ &addr_flat->u.vsock);
+ break;
+ case SOCKET_ADDRESS_FLAT_TYPE_FD:
+ addr->type = SOCKET_ADDRESS_KIND_FD;
+ addr->u.fd.data = QAPI_CLONE(String, &addr_flat->u.fd);
+ break;
+ default:
+ abort();
+ }
+
+ return addr;
+}
--
2.12.1
- [Qemu-devel] [PULL 00/15] Block patches for rc3, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 02/15] nbd sockets vnc: Mark problematic address family tests TODO, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 01/15] block: add missed aio_context_acquire into release_drive, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 03/15] char: Fix socket with "type": "vsock" address, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 04/15] io vnc sockets: Clean up SocketAddressKind switches, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 05/15] block: Document -drive problematic code and bugs, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 06/15] gluster: Prepare for SocketAddressFlat extension, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 07/15] qapi-schema: SocketAddressFlat variants 'vsock' and 'fd', Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 08/15] sockets: New helper socket_address_crumple(),
Max Reitz <=
- [Qemu-devel] [PULL 09/15] nbd: Tidy up blockdev-add interface, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 11/15] qemu-io-cmds: Assert that global and nofile commands don't use ct->perms, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 10/15] sheepdog: Fix blockdev-add, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 13/15] qcow2: Discard unaligned tail when wiping image, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 12/15] iotests: fix 097 when run with qcow, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 15/15] block/parallels: Avoid overflows, Max Reitz, 2017/04/03
- [Qemu-devel] [PULL 14/15] iotests: Improve image-clear tests on non-aligned image, Max Reitz, 2017/04/03
- Re: [Qemu-devel] [PULL 00/15] Block patches for rc3, Peter Maydell, 2017/04/03