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

monitor: Add Monitor parameter to monitor_set_cpu() 

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

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20201005155855.256490-2-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:42 +02:00 committed by Markus Armbruster
parent 497d415d76
commit dcba65f824
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/monitor/monitor.h
View File

@ -33,7 +33,7 @@ int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0); GCC_FMT_ATTR(2, 0);
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(int cpu_index); int monitor_set_cpu(Monitor *mon, int cpu_index);
int monitor_get_cpu_index(void); int monitor_get_cpu_index(void);
void monitor_read_command(MonitorHMP *mon, int show_prompt); void monitor_read_command(MonitorHMP *mon, int show_prompt);

2
monitor/hmp-cmds.c
View File

@ -998,7 +998,7 @@ void hmp_cpu(Monitor *mon, const QDict *qdict)
/* XXX: drop the monitor_set_cpu() usage when all HMP commands that /* XXX: drop the monitor_set_cpu() usage when all HMP commands that
use it are converted to the QAPI */ use it are converted to the QAPI */
cpu_index = qdict_get_int(qdict, "index"); cpu_index = qdict_get_int(qdict, "index");
if (monitor_set_cpu(cpu_index) < 0) { if (monitor_set_cpu(mon, cpu_index) < 0) {
monitor_printf(mon, "invalid CPU index\n"); monitor_printf(mon, "invalid CPU index\n");
} }
} }

10
monitor/misc.c
View File

@ -129,7 +129,7 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
cur_mon = &hmp.common; cur_mon = &hmp.common;
if (has_cpu_index) { if (has_cpu_index) {
int ret = monitor_set_cpu(cpu_index); int ret = monitor_set_cpu(&hmp.common, cpu_index);
if (ret < 0) { if (ret < 0) {
cur_mon = old_mon; cur_mon = old_mon;
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
@ -255,7 +255,7 @@ static void monitor_init_qmp_commands(void)
} }
/* Set the current CPU defined by the user. Callers must hold BQL. */ /* Set the current CPU defined by the user. Callers must hold BQL. */
int monitor_set_cpu(int cpu_index) int monitor_set_cpu(Monitor *mon, int cpu_index)
{ {
CPUState *cpu; CPUState *cpu;
@ -263,8 +263,8 @@ int monitor_set_cpu(int cpu_index)
if (cpu == NULL) { if (cpu == NULL) {
return -1; return -1;
} }
g_free(cur_mon->mon_cpu_path); g_free(mon->mon_cpu_path);
cur_mon->mon_cpu_path = object_get_canonical_path(OBJECT(cpu)); mon->mon_cpu_path = object_get_canonical_path(OBJECT(cpu));
return 0; return 0;
} }
@ -285,7 +285,7 @@ static CPUState *mon_get_cpu_sync(bool synchronize)
if (!first_cpu) { if (!first_cpu) {
return NULL; return NULL;
} }
monitor_set_cpu(first_cpu->cpu_index); monitor_set_cpu(cur_mon, first_cpu->cpu_index);
cpu = first_cpu; cpu = first_cpu;
} }
assert(cpu != NULL); assert(cpu != NULL);