qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL v2 55/61] hw/misc: remove break after g_assert_not_reached()
Date: Thu, 12 Sep 2024 08:52:24 +0200	[thread overview]
Message-ID: <20240912065227.67848-11-philmd@linaro.org> (raw)
In-Reply-To: <20240912065227.67848-1-philmd@linaro.org>

From: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Use of assert(false) can trip spurious control flow warnings from
some versions of GCC (i.e. using -fsanitize=thread with gcc-12):

  error: control reaches end of non-void function [-Werror=return-type]
        default:
            g_assert_not_reached();
            break;
          | ^^^^^

Solve that by removing the unreachable 'break' statement, unifying
the code base on g_assert_not_reached() instead.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240910221606.1817478-29-pierrick.bouvier@linaro.org>
[PMD: Add description suggested by Eric Blake]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/misc/imx6_ccm.c | 1 -
 hw/misc/mac_via.c  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/hw/misc/imx6_ccm.c b/hw/misc/imx6_ccm.c
index b1def7f05b..fd5d7ce482 100644
--- a/hw/misc/imx6_ccm.c
+++ b/hw/misc/imx6_ccm.c
@@ -301,7 +301,6 @@ static uint64_t imx6_analog_get_periph_clk(IMX6CCMState *dev)
     default:
         /* We should never get there */
         g_assert_not_reached();
-        break;
     }
 
     trace_imx6_analog_get_periph_clk(freq);
diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
index 652395b84f..af2b2b1af3 100644
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -495,7 +495,6 @@ static void via1_rtc_update(MOS6522Q800VIA1State *v1s)
                 break;
             default:
                 g_assert_not_reached();
-                break;
             }
             return;
         }
@@ -556,7 +555,6 @@ static void via1_rtc_update(MOS6522Q800VIA1State *v1s)
             break;
         default:
             g_assert_not_reached();
-            break;
         }
         return;
     }
-- 
2.45.2



  parent reply	other threads:[~2024-09-12  6:54 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-12  6:52 [PULL v2 00/61] Misc HW & UI patches for 2024-09-12 Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 44/61] hw/sensor/tmp105: Coding style fixes Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 45/61] hw/sensor/tmp105: Use registerfields API Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 46/61] hw/sensor/tmp105: Pass 'oneshot' argument to tmp105_alarm_update() Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 47/61] hw/sensor/tmp105: OS (one-shot) bit in config register always returns 0 Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 48/61] hw/sensor/tmp105: Lower 4 bit of limit registers are always 0 Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 51/61] hw/char: replace assert(0) with g_assert_not_reached() Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 52/61] hw/core: " Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 53/61] hw/watchdog: " Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 54/61] hw/gpio: remove break after g_assert_not_reached() Philippe Mathieu-Daudé
2024-09-12  6:52 ` Philippe Mathieu-Daudé [this message]
2024-09-12  6:52 ` [PULL v2 56/61] hw/pci-host: " Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 57/61] system: replace assert(0) with g_assert_not_reached() Philippe Mathieu-Daudé
2024-09-12  6:52 ` [PULL v2 61/61] ui: remove break after g_assert_not_reached() Philippe Mathieu-Daudé
2024-09-13 14:30 ` [PULL v2 00/61] Misc HW & UI patches for 2024-09-12 Peter Maydell
2024-09-13 17:04   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240912065227.67848-11-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).