Commit 92082416 authored by Kevin Wolf's avatar Kevin Wolf Committed by Markus Armbruster
Browse files

monitor: Split Monitor.flags into separate bools 



Monitor.flags contains three different flags: One to distinguish HMP
from QMP; one specific to HMP (MONITOR_USE_READLINE) that is ignored
with QMP; and another one specific to QMP (MONITOR_USE_PRETTY) that is
ignored with HMP.

Split the flags field into three bools and move them to the right
subclass. Flags are still in use for the monitor_init() interface.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-Id: <20190613153405.24769-14-kwolf@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 1d95db74

monitor/hmp.c

+3 −3
Original line number Diff line number Diff line
@@ -1398,12 +1398,12 @@ static void monitor_readline_flush(void *opaque) 
void monitor_init_hmp(Chardev *chr, int flags)

{

    MonitorHMP *mon = g_new0(MonitorHMP, 1);

    bool use_readline = flags & MONITOR_USE_READLINE;



    monitor_data_init(&mon->common, flags, false, false);

    monitor_data_init(&mon->common, false, false, false);

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



    if (use_readline) {

    mon->use_readline = flags & MONITOR_USE_READLINE;

    if (mon->use_readline) {

        mon->rs = readline_init(monitor_readline_printf,

                                monitor_readline_flush,

                                mon,

monitor/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index, 
    Monitor *old_mon;

    MonitorHMP hmp = {};



    monitor_data_init(&hmp.common, 0, true, false);

    monitor_data_init(&hmp.common, false, true, false);



    old_mon = cur_mon;

    cur_mon = &hmp.common;

monitor/monitor-internal.h

+5 −3
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ typedef struct HMPCommand { 
struct Monitor {

    CharBackend chr;

    int reset_seen;

    int flags;

    int suspend_cnt;            /* Needs to be accessed atomically */

    bool is_qmp;

    bool skip_flush;

    bool use_io_thread;
@@ -112,6 +112,7 @@ struct Monitor { 


struct MonitorHMP {

    Monitor common;

    bool use_readline;

    /*

     * State used only in the thread "owning" the monitor.

     * If @use_io_thread, this is @mon_iothread. (This does not actually happen
@@ -125,6 +126,7 @@ struct MonitorHMP { 
typedef struct {

    Monitor common;

    JSONMessageParser parser;

    bool pretty;

    /*

     * When a client connects, we're in capabilities negotiation mode.

     * @commands is &qmp_cap_negotiation_commands then.  When command
@@ -148,7 +150,7 @@ typedef struct { 
 */

static inline bool monitor_is_qmp(const Monitor *mon)

{

    return mon->flags & MONITOR_USE_CONTROL;

    return mon->is_qmp;

}



typedef QTAILQ_HEAD(MonitorList, Monitor) MonitorList;
@@ -165,7 +167,7 @@ void monitor_init_qmp(Chardev *chr, int flags); 
void monitor_init_hmp(Chardev *chr, int flags);



int monitor_puts(Monitor *mon, const char *str);

void monitor_data_init(Monitor *mon, int flags, bool skip_flush,

void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush,

                       bool use_io_thread);

void monitor_data_destroy(Monitor *mon);

int monitor_can_read(void *opaque);

monitor/monitor.c

+9 −5
Original line number Diff line number Diff line
@@ -78,14 +78,18 @@ bool monitor_cur_is_qmp(void) 
 * Note: not all HMP monitors use readline, e.g., gdbserver has a

 * non-interactive HMP monitor, so readline is not used there.

 */

static inline bool monitor_uses_readline(const Monitor *mon)

static inline bool monitor_uses_readline(const MonitorHMP *mon)

{

    return mon->flags & MONITOR_USE_READLINE;

    return mon->use_readline;

}



static inline bool monitor_is_hmp_non_interactive(const Monitor *mon)

{

    return !monitor_is_qmp(mon) && !monitor_uses_readline(mon);

    if (monitor_is_qmp(mon)) {

        return false;

    }



    return !monitor_uses_readline(container_of(mon, MonitorHMP, common));

}



static void monitor_flush_locked(Monitor *mon);
@@ -521,17 +525,17 @@ static void monitor_iothread_init(void) 
    mon_iothread = iothread_create("mon_iothread", &error_abort);

}



void monitor_data_init(Monitor *mon, int flags, bool skip_flush,

void monitor_data_init(Monitor *mon, bool is_qmp, bool skip_flush,

                       bool use_io_thread)

{

    if (use_io_thread && !mon_iothread) {

        monitor_iothread_init();

    }

    qemu_mutex_init(&mon->mon_lock);

    mon->is_qmp = is_qmp;

    mon->outbuf = qstring_new();

    mon->skip_flush = skip_flush;

    mon->use_io_thread = use_io_thread;

    mon->flags = flags;

}



void monitor_data_destroy(Monitor *mon)

monitor/qmp.c

+4 −3
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ void qmp_send_response(MonitorQMP *mon, const QDict *rsp) 
    const QObject *data = QOBJECT(rsp);

    QString *json;



    json = mon->common.flags & MONITOR_USE_PRETTY ?

           qobject_to_json_pretty(data) : qobject_to_json(data);

    json = mon->pretty ? qobject_to_json_pretty(data) : qobject_to_json(data);

    assert(json != NULL);



    qstring_append_chr(json, '\n');
@@ -373,9 +372,11 @@ void monitor_init_qmp(Chardev *chr, int flags) 
    assert(!(flags & MONITOR_USE_READLINE));



    /* Note: we run QMP monitor in I/O thread when @chr supports that */

    monitor_data_init(&mon->common, flags, false,

    monitor_data_init(&mon->common, true, false,

                      qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT));



    mon->pretty = flags & MONITOR_USE_PRETTY;



    qemu_mutex_init(&mon->qmp_queue_lock);

    mon->qmp_requests = g_queue_new();