Commit 88a95d10 authored by Peter Xu's avatar Peter Xu Committed by Eric Blake
Browse files

monitor: move skip_flush into monitor_data_init 



It's part of the data init.  Collect it.

Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20180309090006.10018-6-peterx@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent aafb21a0

monitor.c

+4 −4
Original line number Diff line number Diff line
@@ -570,13 +570,14 @@ static void monitor_qapi_event_init(void) 


static void handle_hmp_command(Monitor *mon, const char *cmdline);



static void monitor_data_init(Monitor *mon)

static void monitor_data_init(Monitor *mon, bool skip_flush)

{

    memset(mon, 0, sizeof(Monitor));

    qemu_mutex_init(&mon->out_lock);

    mon->outbuf = qstring_new();

    /* Use *mon_cmds by default. */

    mon->cmd_table = mon_cmds;

    mon->skip_flush = skip_flush;

}



static void monitor_data_destroy(Monitor *mon)
@@ -597,8 +598,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index, 
    char *output = NULL;

    Monitor *old_mon, hmp;



    monitor_data_init(&hmp);

    hmp.skip_flush = true;

    monitor_data_init(&hmp, true);



    old_mon = cur_mon;

    cur_mon = &hmp;
@@ -4042,7 +4042,7 @@ void monitor_init(Chardev *chr, int flags) 
    }



    mon = g_malloc(sizeof(*mon));

    monitor_data_init(mon);

    monitor_data_init(mon, false);



    qemu_chr_fe_init(&mon->chr, chr, &error_abort);

    mon->flags = flags;