mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: Add Monitor parameter to monitor_get_cpu_index()

Browse Source 
Most callers actually don't have to rely on cur_mon, but already know
for which monitor they call monitor_get_cpu_index().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201005155855.256490-3-kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Kevin Wolf 2020-10-05 17:58:43 +02:00 committed by Markus Armbruster
parent dcba65f824
commit 87e6f4a4d6
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/core/machine-hmp-cmds.c
View File

@ -34,7 +34,7 @@ void hmp_info_cpus(Monitor *mon, const QDict *qdict)
for (cpu = cpu_list; cpu; cpu = cpu->next) { for (cpu = cpu_list; cpu; cpu = cpu->next) {
int active = ' '; int active = ' ';
if (cpu->value->cpu_index == monitor_get_cpu_index()) { if (cpu->value->cpu_index == monitor_get_cpu_index(mon)) {
active = '*'; active = '*';
} }

2
include/monitor/monitor.h
View File

@ -34,7 +34,7 @@ int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
int monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3); int monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
void monitor_flush(Monitor *mon); void monitor_flush(Monitor *mon);
int monitor_set_cpu(Monitor *mon, int cpu_index); int monitor_set_cpu(Monitor *mon, int cpu_index);
int monitor_get_cpu_index(void); int monitor_get_cpu_index(Monitor *mon);
void monitor_read_command(MonitorHMP *mon, int show_prompt); void monitor_read_command(MonitorHMP *mon, int show_prompt);
int monitor_read_password(MonitorHMP *mon, ReadLineFunc *readline_func, int monitor_read_password(MonitorHMP *mon, ReadLineFunc *readline_func,

2
monitor/hmp-cmds.c
View File

@ -1009,7 +1009,7 @@ void hmp_memsave(Monitor *mon, const QDict *qdict)
const char *filename = qdict_get_str(qdict, "filename"); const char *filename = qdict_get_str(qdict, "filename");
uint64_t addr = qdict_get_int(qdict, "val"); uint64_t addr = qdict_get_int(qdict, "val");
Error *err = NULL; Error *err = NULL;
int cpu_index = monitor_get_cpu_index(); int cpu_index = monitor_get_cpu_index(mon);
if (cpu_index < 0) { if (cpu_index < 0) {
monitor_printf(mon, "No CPU available\n"); monitor_printf(mon, "No CPU available\n");

20
monitor/misc.c
View File

@ -269,23 +269,23 @@ int monitor_set_cpu(Monitor *mon, int cpu_index)
} }
/* Callers must hold BQL. */ /* Callers must hold BQL. */
static CPUState *mon_get_cpu_sync(bool synchronize) static CPUState *mon_get_cpu_sync(Monitor *mon, bool synchronize)
{ {
CPUState *cpu = NULL; CPUState *cpu = NULL;
if (cur_mon->mon_cpu_path) { if (mon->mon_cpu_path) {
cpu = (CPUState *) object_resolve_path_type(cur_mon->mon_cpu_path, cpu = (CPUState *) object_resolve_path_type(mon->mon_cpu_path,
TYPE_CPU, NULL); TYPE_CPU, NULL);
if (!cpu) { if (!cpu) {
g_free(cur_mon->mon_cpu_path); g_free(mon->mon_cpu_path);
cur_mon->mon_cpu_path = NULL; mon->mon_cpu_path = NULL;
} }
} }
if (!cur_mon->mon_cpu_path) { if (!mon->mon_cpu_path) {
if (!first_cpu) { if (!first_cpu) {
return NULL; return NULL;
} }
monitor_set_cpu(cur_mon, first_cpu->cpu_index); monitor_set_cpu(mon, first_cpu->cpu_index);
cpu = first_cpu; cpu = first_cpu;
} }
assert(cpu != NULL); assert(cpu != NULL);
@ -297,7 +297,7 @@ static CPUState *mon_get_cpu_sync(bool synchronize)
CPUState *mon_get_cpu(void) CPUState *mon_get_cpu(void)
{ {
return mon_get_cpu_sync(true); return mon_get_cpu_sync(cur_mon, true);
} }
CPUArchState *mon_get_cpu_env(void) CPUArchState *mon_get_cpu_env(void)
@ -307,9 +307,9 @@ CPUArchState *mon_get_cpu_env(void)
return cs ? cs->env_ptr : NULL; return cs ? cs->env_ptr : NULL;
} }
int monitor_get_cpu_index(void) int monitor_get_cpu_index(Monitor *mon)
{ {
CPUState *cs = mon_get_cpu_sync(false); CPUState *cs = mon_get_cpu_sync(mon, false);
return cs ? cs->cpu_index : UNASSIGNED_CPU_INDEX; return cs ? cs->cpu_index : UNASSIGNED_CPU_INDEX;
} }

2
softmmu/cpus.c
View File

@ -793,6 +793,6 @@ exit:
void qmp_inject_nmi(Error **errp) void qmp_inject_nmi(Error **errp)
{ {
nmi_monitor_handle(monitor_get_cpu_index(), errp); nmi_monitor_handle(monitor_get_cpu_index(cur_mon), errp);
} }