OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

chardev: remove many local variables in qemu_chr_parse_socket

Browse Source 
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 <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190211182442.8542-7-berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-02-11 18:24:32 +00:00 committed by Marc-André Lureau
parent 767abe7f49
commit 5981c3a232
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
chardev/char-socket.c
View File

@ -1186,18 +1186,10 @@ error:
static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
Error **errp) 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 *path = qemu_opt_get(opts, "path");
const char *host = qemu_opt_get(opts, "host"); const char *host = qemu_opt_get(opts, "host");
const char *port = qemu_opt_get(opts, "port"); const char *port = qemu_opt_get(opts, "port");
const char *fd = qemu_opt_get(opts, "fd"); const char *fd = qemu_opt_get(opts, "fd");
const char *tls_creds = qemu_opt_get(opts, "tls-creds");
SocketAddressLegacy *addr; SocketAddressLegacy *addr;
ChardevSocket *sock; 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); sock = backend->u.socket.data = g_new0(ChardevSocket, 1);
qemu_chr_parse_common(opts, qapi_ChardevSocket_base(sock)); qemu_chr_parse_common(opts, qapi_ChardevSocket_base(sock));
sock->has_nodelay = true; sock->has_nodelay = qemu_opt_get(opts, "delay");
sock->nodelay = do_nodelay; 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->has_server = true;
sock->server = is_listen; sock->server = qemu_opt_get_bool(opts, "server", false);
sock->has_telnet = true; sock->has_telnet = qemu_opt_get(opts, "telnet");
sock->telnet = is_telnet; sock->telnet = qemu_opt_get_bool(opts, "telnet", false);
sock->has_tn3270 = true; sock->has_tn3270 = qemu_opt_get(opts, "tn3270");
sock->tn3270 = is_tn3270; sock->tn3270 = qemu_opt_get_bool(opts, "tn3270", false);
sock->has_websocket = true; sock->has_websocket = qemu_opt_get(opts, "websocket");
sock->websocket = is_websock; sock->websocket = qemu_opt_get_bool(opts, "websocket", false);
/* /*
* We have different default to QMP for 'wait' when 'server' * We have different default to QMP for 'wait' when 'server'
* is set, hence we can't just check for existence of 'wait' * is set, hence we can't just check for existence of 'wait'
*/ */
sock->has_wait = qemu_opt_find(opts, "wait") || is_listen; sock->has_wait = qemu_opt_find(opts, "wait") || sock->server;
sock->wait = is_waitconnect; sock->wait = qemu_opt_get_bool(opts, "wait", true);
sock->has_reconnect = qemu_opt_find(opts, "reconnect"); sock->has_reconnect = qemu_opt_find(opts, "reconnect");
sock->reconnect = reconnect; sock->reconnect = qemu_opt_get_number(opts, "reconnect", 0);
sock->has_tls_creds = tls_creds; sock->has_tls_creds = qemu_opt_get(opts, "tls-creds");
sock->tls_creds = g_strdup(tls_creds); sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds"));
addr = g_new0(SocketAddressLegacy, 1); addr = g_new0(SocketAddressLegacy, 1);
if (path) { if (path) {