[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 8/9] char: refactor parsing of socket address inf
From: |
Daniel P . Berrangé |
Subject: |
[Qemu-devel] [PATCH v5 8/9] char: refactor parsing of socket address information |
Date: |
Mon, 12 Mar 2018 12:49:38 +0000 |
From: "Daniel P. Berrange" <address@hidden>
To prepare for handling more address types, refactor the parsing of
socket address information to make it more robust and extensible.
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
chardev/char-socket.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 1a371b91ac..a916ef4012 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1012,21 +1012,25 @@ static void qemu_chr_parse_socket(QemuOpts *opts,
ChardevBackend *backend,
SocketAddressLegacy *addr;
ChardevSocket *sock;
+ if ((!!path + !!host) != 1) {
+ error_setg(errp,
+ "Exactly one of 'path' or 'host' required");
+ return;
+ }
+
backend->type = CHARDEV_BACKEND_KIND_SOCKET;
- if (!path) {
- if (!host) {
- error_setg(errp, "chardev: socket: no host given");
+ if (path) {
+ if (tls_creds) {
+ error_setg(errp, "TLS can only be used over TCP socket");
return;
}
+ } else if (host) {
if (!port) {
error_setg(errp, "chardev: socket: no port given");
return;
}
} else {
- if (tls_creds) {
- error_setg(errp, "TLS can only be used over TCP socket");
- return;
- }
+ g_assert_not_reached();
}
sock = backend->u.socket.data = g_new0(ChardevSocket, 1);
@@ -1052,7 +1056,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts,
ChardevBackend *backend,
addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX;
q_unix = addr->u.q_unix.data = g_new0(UnixSocketAddress, 1);
q_unix->path = g_strdup(path);
- } else {
+ } else if (host) {
addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;
addr->u.inet.data = g_new(InetSocketAddress, 1);
*addr->u.inet.data = (InetSocketAddress) {
@@ -1065,6 +1069,8 @@ static void qemu_chr_parse_socket(QemuOpts *opts,
ChardevBackend *backend,
.has_ipv6 = qemu_opt_get(opts, "ipv6"),
.ipv6 = qemu_opt_get_bool(opts, "ipv6", 0),
};
+ } else {
+ g_assert_not_reached();
}
sock->addr = addr;
}
--
2.14.3
- [Qemu-devel] [PATCH v5 0/9] Enable passing pre-opened chardev socket FD, Daniel P . Berrangé, 2018/03/12
- [Qemu-devel] [PATCH v5 1/9] char: don't silently skip tn3270 protocol init when TLS is enabled, Daniel P . Berrangé, 2018/03/12
- [Qemu-devel] [PATCH v5 7/9] sockets: allow SocketAddress 'fd' to reference numeric file descriptors, Daniel P . Berrangé, 2018/03/12
- [Qemu-devel] [PATCH v5 4/9] sockets: strengthen test suite IP protocol availability checks, Daniel P . Berrangé, 2018/03/12
- [Qemu-devel] [PATCH v5 2/9] cutils: add qemu_strtoi & qemu_strtoui parsers for int/unsigned int types, Daniel P . Berrangé, 2018/03/12
- [Qemu-devel] [PATCH v5 9/9] char: allow passing pre-opened socket file descriptor at startup, Daniel P . Berrangé, 2018/03/12