Commit e990a393 authored by liguang's avatar liguang Committed by Michael Tokarev
Browse files

qemu-char: use bool in qemu_chr_open_socket and simplify code a bit 



Local variables is_* should be bool by usage.
While at it, simplify the logic/code a bit.

Signed-off-by: default avatarliguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 2c8cf549

qemu-char.c

+6 −13
Original line number Diff line number Diff line
@@ -2679,19 +2679,12 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts) 
    CharDriverState *chr = NULL;

    Error *local_err = NULL;

    int fd = -1;

    int is_listen;

    int is_waitconnect;

    int do_nodelay;

    int is_unix;

    int is_telnet;



    is_listen      = qemu_opt_get_bool(opts, "server", 0);

    is_waitconnect = qemu_opt_get_bool(opts, "wait", 1);

    is_telnet      = qemu_opt_get_bool(opts, "telnet", 0);

    do_nodelay     = !qemu_opt_get_bool(opts, "delay", 1);

    is_unix        = qemu_opt_get(opts, "path") != NULL;

    if (!is_listen)

        is_waitconnect = 0;



    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 do_nodelay     = !qemu_opt_get_bool(opts, "delay", true);

    bool is_unix        = qemu_opt_get(opts, "path") != NULL;



    if (is_unix) {

        if (is_listen) {