ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kevin Wolf 2020-11-13 12:43:24 +01:00 committed by Dr. David Alan Gilbert
parent be2df2ac6f
commit 2fc5d01bb4
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/monitor/hmp-target.h
View File

@ -41,7 +41,7 @@ const MonitorDef *target_monitor_defs(void);
int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
CPUArchState *mon_get_cpu_env(void); CPUArchState *mon_get_cpu_env(void);
CPUState *mon_get_cpu(void); CPUState *mon_get_cpu(Monitor *mon);
void hmp_info_mem(Monitor *mon, const QDict *qdict); void hmp_info_mem(Monitor *mon, const QDict *qdict);
void hmp_info_tlb(Monitor *mon, const QDict *qdict); void hmp_info_tlb(Monitor *mon, const QDict *qdict);

2
monitor/hmp.c
View File

@ -384,7 +384,7 @@ static int64_t expr_unary(Monitor *mon)
pch++; pch++;
} }
*q = 0; *q = 0;
ret = get_monitor_def(&reg, buf); ret = get_monitor_def(mon, &reg, buf);
if (ret < 0) { if (ret < 0) {
expr_error(mon, "unknown register"); expr_error(mon, "unknown register");
} }

18
monitor/misc.c
View File

@ -289,14 +289,14 @@ static CPUState *mon_get_cpu_sync(Monitor *mon, bool synchronize)
return cpu; 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) CPUArchState *mon_get_cpu_env(void)
{ {
CPUState *cs = mon_get_cpu(); CPUState *cs = mon_get_cpu(monitor_cur());
return cs ? cs->env_ptr : NULL; 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); cpu_dump_state(cs, NULL, CPU_DUMP_FPU);
} }
} else { } else {
cs = mon_get_cpu(); cs = mon_get_cpu(mon);
if (!cs) { if (!cs) {
monitor_printf(mon, "No CPU available\n"); 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) static void hmp_info_cpustats(Monitor *mon, const QDict *qdict)
{ {
CPUState *cs = mon_get_cpu(); CPUState *cs = mon_get_cpu(mon);
if (!cs) { if (!cs) {
monitor_printf(mon, "No CPU available\n"); 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; int l, line_size, i, max_digits, len;
uint8_t buf[16]; uint8_t buf[16];
uint64_t v; uint64_t v;
CPUState *cs = mon_get_cpu(); CPUState *cs = mon_get_cpu(mon);
if (!cs && (format == 'i' || !is_physical)) { if (!cs && (format == 'i' || !is_physical)) {
monitor_printf(mon, "Can not dump without CPU\n"); 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"); target_ulong addr = qdict_get_int(qdict, "addr");
MemTxAttrs attrs; MemTxAttrs attrs;
CPUState *cs = mon_get_cpu(); CPUState *cs = mon_get_cpu(mon);
hwaddr gpa; hwaddr gpa;
if (!cs) { if (!cs) {
@ -1663,10 +1663,10 @@ HMPCommand hmp_cmds[] = {
* Set @pval to the value in the register identified by @name. * Set @pval to the value in the register identified by @name.
* return 0 if OK, -1 if not found * 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(); const MonitorDef *md = target_monitor_defs();
CPUState *cs = mon_get_cpu(); CPUState *cs = mon_get_cpu(mon);
void *ptr; void *ptr;
uint64_t tmp = 0; uint64_t tmp = 0;
int ret; int ret;

2
monitor/monitor-internal.h
View File

@ -178,7 +178,7 @@ void qmp_send_response(MonitorQMP *mon, const QDict *rsp);
void monitor_data_destroy_qmp(MonitorQMP *mon); void monitor_data_destroy_qmp(MonitorQMP *mon);
void coroutine_fn monitor_qmp_dispatcher_co(void *data); 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 help_cmd(Monitor *mon, const char *name);
void handle_hmp_command(MonitorHMP *mon, const char *cmdline); void handle_hmp_command(MonitorHMP *mon, const char *cmdline);
int hmp_compare_cmd(const char *name, const char *list); int hmp_compare_cmd(const char *name, const char *list);

2
target/i386/monitor.c
View File

@ -656,7 +656,7 @@ void hmp_info_local_apic(Monitor *mon, const QDict *qdict)
int id = qdict_get_try_int(qdict, "apic-id", 0); int id = qdict_get_try_int(qdict, "apic-id", 0);
cs = cpu_by_arch_id(id); cs = cpu_by_arch_id(id);
} else { } else {
cs = mon_get_cpu(); cs = mon_get_cpu(mon);
} }