[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/29] tcg: Remove error return from tcg_region_initial_alloc_
From: |
Richard Henderson |
Subject: |
[PATCH v2 04/29] tcg: Remove error return from tcg_region_initial_alloc__locked |
Date: |
Sun, 14 Mar 2021 15:26:59 -0600 |
All callers immediately assert on error, so move the assert
into the function itself.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/tcg.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 0a2e5710de..2b631fccdf 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -720,9 +720,10 @@ static bool tcg_region_alloc(TCGContext *s)
* Perform a context's first region allocation.
* This function does _not_ increment region.agg_size_full.
*/
-static inline bool tcg_region_initial_alloc__locked(TCGContext *s)
+static void tcg_region_initial_alloc__locked(TCGContext *s)
{
- return tcg_region_alloc__locked(s);
+ bool err = tcg_region_alloc__locked(s);
+ g_assert(!err);
}
/* Call from a safe-work context */
@@ -737,9 +738,7 @@ void tcg_region_reset_all(void)
for (i = 0; i < n_ctxs; i++) {
TCGContext *s = qatomic_read(&tcg_ctxs[i]);
- bool err = tcg_region_initial_alloc__locked(s);
-
- g_assert(!err);
+ tcg_region_initial_alloc__locked(s);
}
qemu_mutex_unlock(®ion.lock);
@@ -874,11 +873,7 @@ void tcg_region_init(void)
/* In user-mode we support only one ctx, so do the initial allocation now
*/
#ifdef CONFIG_USER_ONLY
- {
- bool err = tcg_region_initial_alloc__locked(tcg_ctx);
-
- g_assert(!err);
- }
+ tcg_region_initial_alloc__locked(tcg_ctx);
#endif
}
@@ -940,7 +935,6 @@ void tcg_register_thread(void)
MachineState *ms = MACHINE(qdev_get_machine());
TCGContext *s = g_malloc(sizeof(*s));
unsigned int i, n;
- bool err;
*s = tcg_init_ctx;
@@ -964,8 +958,7 @@ void tcg_register_thread(void)
tcg_ctx = s;
qemu_mutex_lock(®ion.lock);
- err = tcg_region_initial_alloc__locked(tcg_ctx);
- g_assert(!err);
+ tcg_region_initial_alloc__locked(s);
qemu_mutex_unlock(®ion.lock);
}
#endif /* !CONFIG_USER_ONLY */
--
2.25.1
- [PATCH v2 00/29] tcg: Workaround macOS 11.2 mprotect bug, Richard Henderson, 2021/03/14
- [PATCH v2 01/29] meson: Split out tcg/meson.build, Richard Henderson, 2021/03/14
- [PATCH v2 03/29] tcg: Re-order tcg_region_init vs tcg_prologue_init, Richard Henderson, 2021/03/14
- [PATCH v2 02/29] meson: Split out fpu/meson.build, Richard Henderson, 2021/03/14
- [PATCH v2 04/29] tcg: Remove error return from tcg_region_initial_alloc__locked,
Richard Henderson <=
- [PATCH v2 05/29] tcg: Split out tcg_region_initial_alloc, Richard Henderson, 2021/03/14
- [PATCH v2 06/29] tcg: Split out tcg_region_prologue_set, Richard Henderson, 2021/03/14
- [PATCH v2 08/29] accel/tcg: Inline cpu_gen_init, Richard Henderson, 2021/03/14
- [PATCH v2 07/29] tcg: Split out region.c, Richard Henderson, 2021/03/14
- [PATCH v2 09/29] accel/tcg: Move alloc_code_gen_buffer to tcg/region.c, Richard Henderson, 2021/03/14
- [PATCH v2 11/29] tcg: Create tcg_init, Richard Henderson, 2021/03/14
- [PATCH v2 12/29] accel/tcg: Merge tcg_exec_init into tcg_init_machine, Richard Henderson, 2021/03/14
- [PATCH v2 10/29] accel/tcg: Rename tcg_init to tcg_init_machine, Richard Henderson, 2021/03/14
- [PATCH v2 13/29] accel/tcg: Pass down max_cpus to tcg_init, Richard Henderson, 2021/03/14
- [PATCH v2 14/29] tcg: Introduce tcg_max_ctxs, Richard Henderson, 2021/03/14