[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/6] system/vl: Evaluate icount after accelerator options are
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 2/6] system/vl: Evaluate icount after accelerator options are parsed |
Date: |
Fri, 8 Dec 2023 12:35:24 +0100 |
We need to parse the accelerators first, to be able
to check whether TCG is enabled or not. Then we can
parse the -icount option.
This allows removing the icount_configure() stub.
Fixes: 7f8b6126e7 ("vl: move icount configuration earlier")
Reported-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
stubs/icount.c | 8 --------
system/vl.c | 16 +++++++++-------
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/stubs/icount.c b/stubs/icount.c
index 85c381a0ea..014ae5d8e4 100644
--- a/stubs/icount.c
+++ b/stubs/icount.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "qapi/error.h"
#include "sysemu/cpu-timers.h"
/* icount - Instruction Counter API */
@@ -10,13 +9,6 @@ void icount_update(CPUState *cpu)
{
abort();
}
-bool icount_configure(QemuOpts *opts, Error **errp)
-{
- /* signal error */
- error_setg(errp, "cannot configure icount, TCG support not available");
-
- return false;
-}
int64_t icount_get_raw(void)
{
abort();
diff --git a/system/vl.c b/system/vl.c
index 17234012d4..af809331bb 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -2270,6 +2270,13 @@ static void user_register_global_props(void)
static int do_configure_icount(void *opaque, QemuOpts *opts, Error **errp)
{
+ if (!tcg_enabled()) {
+ error_setg(errp, "cannot configure icount, TCG support not available");
+ error_append_hint(errp, "-icount is not allowed with"
+ " hardware virtualization\n");
+ return 1;
+ }
+
return !icount_configure(opts, errp);
}
@@ -2339,9 +2346,6 @@ static void configure_accelerators(const char *progname)
{
bool init_failed = false;
- qemu_opts_foreach(qemu_find_opts("icount"),
- do_configure_icount, NULL, &error_fatal);
-
if (QTAILQ_EMPTY(&qemu_accel_opts.head)) {
char **accel_list, **tmp;
@@ -2401,10 +2405,8 @@ static void configure_accelerators(const char *progname)
error_report("falling back to %s", current_accel_name());
}
- if (icount_enabled() && !tcg_enabled()) {
- error_report("-icount is not allowed with hardware virtualization");
- exit(1);
- }
+ qemu_opts_foreach(qemu_find_opts("icount"),
+ do_configure_icount, NULL, &error_fatal);
}
static void qemu_validate_options(const QDict *machine_opts)
--
2.41.0
- [PATCH v3 0/6] sysemu/replay: Restrict icount to TCG system emulation, Philippe Mathieu-Daudé, 2023/12/08
- [PATCH v3 2/6] system/vl: Evaluate icount after accelerator options are parsed,
Philippe Mathieu-Daudé <=
- [PATCH v3 1/6] sysemu/cpu-timers: Have icount_configure() return a boolean, Philippe Mathieu-Daudé, 2023/12/08
- [PATCH v3 3/6] sysemu/cpu-timers: Introduce ICountMode enumerator, Philippe Mathieu-Daudé, 2023/12/08
- [PATCH v3 4/6] target/arm: Ensure icount is enabled when emulating INST_RETIRED, Philippe Mathieu-Daudé, 2023/12/08
- [PATCH v3 5/6] util/async: Only call icount_notify_exit() if icount is enabled, Philippe Mathieu-Daudé, 2023/12/08
- [PATCH v3 6/6] sysemu/replay: Restrict icount to system emulation, Philippe Mathieu-Daudé, 2023/12/08