diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-11-13 12:43:24 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2020-11-13 12:45:35 +0000 |
| commit | 2fc5d01bb43049851a95c8a66df7ee33e3489b54 (patch) | |
| tree | 1e74f5edf47a4672ba529ae05f536a1abf0aa5fd /monitor | |
| parent | be2df2ac6f6b9eeee21cc057de0a119ac30fbc60 (diff) | |
hmp: Pass monitor to mon_get_cpu()
mon_get_cpu() is indirectly called monitor_parse_arguments() where
the current monitor isn't set yet. Instead of using monitor_cur(),
explicitly pass the Monitor pointer to the function.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201113114326.97663-2-kwolf@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/hmp.c | 2 | ||||
| -rw-r--r-- | monitor/misc.c | 18 | ||||
| -rw-r--r-- | monitor/monitor-internal.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/monitor/hmp.c b/monitor/hmp.c index c5cd9d372b..1204233999 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -384,7 +384,7 @@ static int64_t expr_unary(Monitor *mon) pch++; } *q = 0; - ret = get_monitor_def(®, buf); + ret = get_monitor_def(mon, ®, buf); if (ret < 0) { expr_error(mon, "unknown register"); } diff --git a/monitor/misc.c b/monitor/misc.c index 32e6a8c13d..c918d6bd08 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -289,14 +289,14 @@ static CPUState *mon_get_cpu_sync(Monitor *mon, bool synchronize) return cpu; } -CPUState *mon_get_cpu(void) +CPUState *mon_get_cpu(Monitor *mon) { - return mon_get_cpu_sync(monitor_cur(), true); + return mon_get_cpu_sync(mon, true); } CPUArchState *mon_get_cpu_env(void) { - CPUState *cs = mon_get_cpu(); + CPUState *cs = mon_get_cpu(monitor_cur()); return cs ? cs->env_ptr : NULL; } @@ -319,7 +319,7 @@ static void hmp_info_registers(Monitor *mon, const QDict *qdict) cpu_dump_state(cs, NULL, CPU_DUMP_FPU); } } else { - cs = mon_get_cpu(); + cs = mon_get_cpu(mon); if (!cs) { monitor_printf(mon, "No CPU available\n"); @@ -381,7 +381,7 @@ static void hmp_info_history(Monitor *mon, const QDict *qdict) static void hmp_info_cpustats(Monitor *mon, const QDict *qdict) { - CPUState *cs = mon_get_cpu(); + CPUState *cs = mon_get_cpu(mon); if (!cs) { monitor_printf(mon, "No CPU available\n"); @@ -546,7 +546,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, int l, line_size, i, max_digits, len; uint8_t buf[16]; uint64_t v; - CPUState *cs = mon_get_cpu(); + CPUState *cs = mon_get_cpu(mon); if (!cs && (format == 'i' || !is_physical)) { monitor_printf(mon, "Can not dump without CPU\n"); @@ -711,7 +711,7 @@ static void hmp_gva2gpa(Monitor *mon, const QDict *qdict) { target_ulong addr = qdict_get_int(qdict, "addr"); MemTxAttrs attrs; - CPUState *cs = mon_get_cpu(); + CPUState *cs = mon_get_cpu(mon); hwaddr gpa; if (!cs) { @@ -1663,10 +1663,10 @@ HMPCommand hmp_cmds[] = { * Set @pval to the value in the register identified by @name. * return 0 if OK, -1 if not found */ -int get_monitor_def(int64_t *pval, const char *name) +int get_monitor_def(Monitor *mon, int64_t *pval, const char *name) { const MonitorDef *md = target_monitor_defs(); - CPUState *cs = mon_get_cpu(); + CPUState *cs = mon_get_cpu(mon); void *ptr; uint64_t tmp = 0; int ret; diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index ad2e64be13..a6131554da 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -178,7 +178,7 @@ void qmp_send_response(MonitorQMP *mon, const QDict *rsp); void monitor_data_destroy_qmp(MonitorQMP *mon); void coroutine_fn monitor_qmp_dispatcher_co(void *data); -int get_monitor_def(int64_t *pval, const char *name); +int get_monitor_def(Monitor *mon, int64_t *pval, const char *name); void help_cmd(Monitor *mon, const char *name); void handle_hmp_command(MonitorHMP *mon, const char *cmdline); int hmp_compare_cmd(const char *name, const char *list); |