[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/28] sockets: Prepare vsock_parse() for flattened S
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 13/28] sockets: Prepare vsock_parse() for flattened SocketAddress |
Date: |
Thu, 4 May 2017 17:23:50 +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>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <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-devel] [PULL 12/28] test-qga: Actually test 0xff sync bytes, (continued)
- [Qemu-devel] [PULL 12/28] test-qga: Actually test 0xff sync bytes, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 27/28] qmp-shell: don't show version greeting if unavailable, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 15/28] qapi: New QAPI_CLONE_MEMBERS(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 19/28] sockets: Delete unused helper socket_address_crumple(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 14/28] sockets: Prepare inet_parse() for flattened SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 06/28] qobject: Drop useless QObject casts, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 25/28] qmp-shell: add -N option to skip negotiate, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 24/28] qmp-shell: add persistent command history, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 23/28] qobject-input-visitor: Catch misuse of end_struct vs. end_list, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 08/28] qobject: Use simpler QDict/QList scalar insertion macros, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 13/28] sockets: Prepare vsock_parse() for flattened SocketAddress,
Markus Armbruster <=
- [Qemu-devel] [PULL 16/28] sockets: Rename SocketAddress to SocketAddressLegacy, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 28/28] qmp-shell: improve help, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 17/28] sockets: Rename SocketAddressFlat to SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 18/28] sockets: Limit SocketAddressLegacy to external interfaces, Markus Armbruster, 2017/05/04
- Re: [Qemu-devel] [PULL 00/28] QAPI patches for 2017-05-04, no-reply, 2017/05/04