[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 1/7] sockets: Prepare vsock_parse() for flattened So
From: |
Markus Armbruster |
Subject: |
[Qemu-block] [PATCH 1/7] sockets: Prepare vsock_parse() for flattened SocketAddress |
Date: |
Wed, 26 Apr 2017 09:36:36 +0200 |
I'm going to flatten SocketAddress: rename SocketAddress to
SocketAddressLegacy, SocketAddressFlat to SocketAddress, eliminate
SocketAddressLegacy except in external interfaces.
vsock_parse() returns a newly allocated VsockSocketAddress. Lift the
allocation from vsock_parse() into its caller socket_parse() to
prepare for flattening SocketAddress.
Signed-off-by: Markus Armbruster <address@hidden>
---
util/qemu-sockets.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 8188d9a..1abe095 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -793,26 +793,25 @@ static int vsock_listen_saddr(VsockSocketAddress *vaddr,
return slisten;
}
-static VsockSocketAddress *vsock_parse(const char *str, Error **errp)
+static int vsock_parse(VsockSocketAddress *addr, const char *str,
+ Error **errp)
{
- VsockSocketAddress *addr = NULL;
char cid[33];
char port[33];
int n;
if (sscanf(str, "%32[^:]:%32[^,]%n", cid, port, &n) != 2) {
error_setg(errp, "error parsing address '%s'", str);
- return NULL;
+ return -1;
}
if (str[n] != '\0') {
error_setg(errp, "trailing characters in address '%s'", str);
- return NULL;
+ return -1;
}
- addr = g_new0(VsockSocketAddress, 1);
addr->cid = g_strdup(cid);
addr->port = g_strdup(port);
- return addr;
+ return 0;
}
#else
static void vsock_unsupported(Error **errp)
@@ -835,10 +834,11 @@ static int vsock_listen_saddr(VsockSocketAddress *vaddr,
return -1;
}
-static VsockSocketAddress *vsock_parse(const char *str, Error **errp)
+static int vsock_parse(VsockSocketAddress *addr, const char *str,
+ Error **errp)
{
vsock_unsupported(errp);
- return NULL;
+ return -1;
}
#endif /* CONFIG_AF_VSOCK */
@@ -1060,8 +1060,8 @@ SocketAddress *socket_parse(const char *str, Error **errp)
}
} else if (strstart(str, "vsock:", NULL)) {
addr->type = SOCKET_ADDRESS_KIND_VSOCK;
- addr->u.vsock.data = vsock_parse(str + strlen("vsock:"), errp);
- if (addr->u.vsock.data == NULL) {
+ addr->u.vsock.data = g_new(VsockSocketAddress, 1);
+ if (vsock_parse(addr->u.vsock.data, str + strlen("vsock:"), errp)) {
goto fail;
}
} else {
--
2.7.4
- [Qemu-block] [PATCH 0/7] sockets: Flatten SocketAddress except in external interfaces, Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 7/7] socket: Delete unused helper socket_address_crumple(), Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 1/7] sockets: Prepare vsock_parse() for flattened SocketAddress,
Markus Armbruster <=
- [Qemu-block] [PATCH 2/7] sockets: Prepare inet_parse() for flattened SocketAddress, Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 3/7] qapi: New QAPI_CLONE_MEMBERS(), Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 5/7] sockets: Rename SocketAddressFlat to SocketAddress, Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 4/7] sockets: Rename SocketAddress to SocketAddressLegacy, Markus Armbruster, 2017/04/26