[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 4/5] tcg/tcg: Do not declare local variable only used for ass
From: |
Greg Kurz |
Subject: |
Re: [PATCH 4/5] tcg/tcg: Do not declare local variable only used for assertion |
Date: |
Wed, 2 Sep 2020 11:02:34 +0200 |
On Wed, 2 Sep 2020 10:08:00 +0200
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> This variable is used once in an assertion. Remove single
> declaration and access directly in the assert().
>
> See in "qemu/osdep.h":
>
> * [...] disable assertion is not
> * supported upstream so the risk is all yours. Meanwhile, please
> * submit patches to remove any side-effects inside an assertion, or
> * fixing error handling that should use Error instead of assert.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
Ditto.
> tcg/tcg.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index 62f299e36e5..0bff49e544a 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -777,7 +777,6 @@ void tcg_register_thread(void)
> #else
> void tcg_register_thread(void)
> {
> - MachineState *ms = MACHINE(qdev_get_machine());
> TCGContext *s = g_malloc(sizeof(*s));
> unsigned int i, n;
> bool err;
> @@ -795,7 +794,7 @@ void tcg_register_thread(void)
>
> /* Claim an entry in tcg_ctxs */
> n = atomic_fetch_inc(&n_tcg_ctxs);
> - g_assert(n < ms->smp.max_cpus);
> + g_assert(n < MACHINE(qdev_get_machine())->smp.max_cpus);
> atomic_set(&tcg_ctxs[n], s);
>
> if (n > 0) {
- [PATCH 0/5] misc: Reduce assert side-effects, Philippe Mathieu-Daudé, 2020/09/02
- [PATCH 1/5] tests/qtest/ipmi-kcs: Fix assert side-effect, Philippe Mathieu-Daudé, 2020/09/02
- [PATCH 2/5] hw/pci-bridge: Do not declare local variable only used for assertion, Philippe Mathieu-Daudé, 2020/09/02
- [PATCH 4/5] tcg/tcg: Do not declare local variable only used for assertion, Philippe Mathieu-Daudé, 2020/09/02
- Re: [PATCH 4/5] tcg/tcg: Do not declare local variable only used for assertion,
Greg Kurz <=
- [PATCH 5/5] util/qsp: Do not declare local variable only used for assertion, Philippe Mathieu-Daudé, 2020/09/02
- [PATCH 3/5] hw/ppc/spapr: Do not declare local variable only used for assertion, Philippe Mathieu-Daudé, 2020/09/02