[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 01/12] monitor: Add Monitor parameter to monitor_set_cpu()
From: |
Kevin Wolf |
Subject: |
[PATCH v6 01/12] monitor: Add Monitor parameter to monitor_set_cpu() |
Date: |
Thu, 28 May 2020 17:37:31 +0200 |
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>
---
include/monitor/monitor.h | 2 +-
monitor/hmp-cmds.c | 2 +-
monitor/misc.c | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index 1018d754a6..0dcaefd4f9 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -33,7 +33,7 @@ int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0);
int monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
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);
void monitor_read_command(MonitorHMP *mon, int show_prompt);
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 9c61e769ca..5e22ee2556 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -969,7 +969,7 @@ void hmp_cpu(Monitor *mon, const QDict *qdict)
/* XXX: drop the monitor_set_cpu() usage when all HMP commands that
use it are converted to the QAPI */
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");
}
}
diff --git a/monitor/misc.c b/monitor/misc.c
index f5207cd242..bdf49e49e5 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -130,7 +130,7 @@ char *qmp_human_monitor_command(const char *command_line,
bool has_cpu_index,
cur_mon = &hmp.common;
if (has_cpu_index) {
- int ret = monitor_set_cpu(cpu_index);
+ int ret = monitor_set_cpu(&hmp.common, cpu_index);
if (ret < 0) {
cur_mon = old_mon;
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
@@ -256,7 +256,7 @@ static void monitor_init_qmp_commands(void)
}
/* 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;
@@ -264,8 +264,8 @@ int monitor_set_cpu(int cpu_index)
if (cpu == NULL) {
return -1;
}
- g_free(cur_mon->mon_cpu_path);
- cur_mon->mon_cpu_path = object_get_canonical_path(OBJECT(cpu));
+ g_free(mon->mon_cpu_path);
+ mon->mon_cpu_path = object_get_canonical_path(OBJECT(cpu));
return 0;
}
@@ -286,7 +286,7 @@ static CPUState *mon_get_cpu_sync(bool synchronize)
if (!first_cpu) {
return NULL;
}
- monitor_set_cpu(first_cpu->cpu_index);
+ monitor_set_cpu(cur_mon, first_cpu->cpu_index);
cpu = first_cpu;
}
assert(cpu != NULL);
--
2.25.4
- [PATCH v6 00/12] monitor: Optionally run handlers in coroutines, Kevin Wolf, 2020/05/28
- [PATCH v6 02/12] monitor: Use getter/setter functions for cur_mon, Kevin Wolf, 2020/05/28
- [PATCH v6 03/12] hmp: Set cur_mon only in handle_hmp_command(), Kevin Wolf, 2020/05/28
- [PATCH v6 01/12] monitor: Add Monitor parameter to monitor_set_cpu(),
Kevin Wolf <=
- [PATCH v6 05/12] qmp: Call monitor_set_cur() only in qmp_dispatch(), Kevin Wolf, 2020/05/28
- [PATCH v6 06/12] monitor: Make current monitor a per-coroutine property, Kevin Wolf, 2020/05/28
- [PATCH v6 04/12] qmp: Assert that no other monitor is active, Kevin Wolf, 2020/05/28
- [PATCH v6 07/12] qapi: Add a 'coroutine' flag for commands, Kevin Wolf, 2020/05/28
- [PATCH v6 08/12] qmp: Move dispatcher to a coroutine, Kevin Wolf, 2020/05/28
- [PATCH v6 09/12] hmp: Add support for coroutine command handlers, Kevin Wolf, 2020/05/28