[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/16] chardev: remove many local variables in qe
From: |
Daniel P . Berrangé |
Subject: |
[Qemu-devel] [PATCH v3 06/16] chardev: remove many local variables in qemu_chr_parse_socket |
Date: |
Mon, 11 Feb 2019 18:24:32 +0000 |
Now that all validation is separated off into a separate method,
we can directly populate the ChardevSocket struct from the
QemuOpts values, avoiding many local variables.
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
---
chardev/char-socket.c | 40 ++++++++++++++++++----------------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 728342dc9f..8a6e203da7 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1186,18 +1186,10 @@ error:
static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
Error **errp)
{
- bool is_listen = qemu_opt_get_bool(opts, "server", false);
- bool is_waitconnect = is_listen && qemu_opt_get_bool(opts, "wait", true);
- bool is_telnet = qemu_opt_get_bool(opts, "telnet", false);
- bool is_tn3270 = qemu_opt_get_bool(opts, "tn3270", false);
- bool is_websock = qemu_opt_get_bool(opts, "websocket", false);
- bool do_nodelay = !qemu_opt_get_bool(opts, "delay", true);
- int64_t reconnect = qemu_opt_get_number(opts, "reconnect", 0);
const char *path = qemu_opt_get(opts, "path");
const char *host = qemu_opt_get(opts, "host");
const char *port = qemu_opt_get(opts, "port");
const char *fd = qemu_opt_get(opts, "fd");
- const char *tls_creds = qemu_opt_get(opts, "tls-creds");
SocketAddressLegacy *addr;
ChardevSocket *sock;
@@ -1216,26 +1208,30 @@ static void qemu_chr_parse_socket(QemuOpts *opts,
ChardevBackend *backend,
sock = backend->u.socket.data = g_new0(ChardevSocket, 1);
qemu_chr_parse_common(opts, qapi_ChardevSocket_base(sock));
- sock->has_nodelay = true;
- sock->nodelay = do_nodelay;
+ sock->has_nodelay = qemu_opt_get(opts, "delay");
+ sock->nodelay = !qemu_opt_get_bool(opts, "delay", true);
+ /*
+ * We have different default to QMP for 'server', hence
+ * we can't just check for existence of 'server'
+ */
sock->has_server = true;
- sock->server = is_listen;
- sock->has_telnet = true;
- sock->telnet = is_telnet;
- sock->has_tn3270 = true;
- sock->tn3270 = is_tn3270;
- sock->has_websocket = true;
- sock->websocket = is_websock;
+ sock->server = qemu_opt_get_bool(opts, "server", false);
+ sock->has_telnet = qemu_opt_get(opts, "telnet");
+ sock->telnet = qemu_opt_get_bool(opts, "telnet", false);
+ sock->has_tn3270 = qemu_opt_get(opts, "tn3270");
+ sock->tn3270 = qemu_opt_get_bool(opts, "tn3270", false);
+ sock->has_websocket = qemu_opt_get(opts, "websocket");
+ sock->websocket = qemu_opt_get_bool(opts, "websocket", false);
/*
* We have different default to QMP for 'wait' when 'server'
* is set, hence we can't just check for existence of 'wait'
*/
- sock->has_wait = qemu_opt_find(opts, "wait") || is_listen;
- sock->wait = is_waitconnect;
+ sock->has_wait = qemu_opt_find(opts, "wait") || sock->server;
+ sock->wait = qemu_opt_get_bool(opts, "wait", true);
sock->has_reconnect = qemu_opt_find(opts, "reconnect");
- sock->reconnect = reconnect;
- sock->has_tls_creds = tls_creds;
- sock->tls_creds = g_strdup(tls_creds);
+ sock->reconnect = qemu_opt_get_number(opts, "reconnect", 0);
+ sock->has_tls_creds = qemu_opt_get(opts, "tls-creds");
+ sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds"));
addr = g_new0(SocketAddressLegacy, 1);
if (path) {
--
2.20.1
- [Qemu-devel] [PATCH v3 00/16] chardev: refactoring & many bugfixes related tcp_chr_wait_connected, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 01/16] io: store reference to thread information in the QIOTask struct, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 02/16] io: add qio_task_wait_thread to join with a background thread, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 03/16] chardev: fix validation of options for QMP created chardevs, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 04/16] chardev: forbid 'reconnect' option with server sockets, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 05/16] chardev: forbid 'wait' option with client sockets, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 06/16] chardev: remove many local variables in qemu_chr_parse_socket,
Daniel P . Berrangé <=
- [Qemu-devel] [PATCH v3 07/16] chardev: ensure qemu_chr_parse_compat reports missing driver error, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 08/16] chardev: remove unused 'sioc' variable & cleanup paths, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 09/16] chardev: split tcp_chr_wait_connected into two methods, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 10/16] chardev: split up qmp_chardev_open_socket connection code, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 11/16] chardev: use a state machine for socket connection state, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 12/16] chardev: honour the reconnect setting in tcp_chr_wait_connected, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 14/16] chardev: fix race with client connections in tcp_chr_wait_connected, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 16/16] chardev: ensure termios is fully initialized, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 13/16] chardev: disallow TLS/telnet/websocket with tcp_chr_wait_connected, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 15/16] tests: expand coverage of socket chardev test, Daniel P . Berrangé, 2019/02/11