summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPierrick Bouvier <pierrick.bouvier@linaro.org>2024-09-10 15:15:55 -0700
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2024-09-13 20:12:16 +0200
commitcdcb78dba4d2c52bc80c37c2149e0a090ab6a6b2 (patch)
treea1c9ecee1d1a9b5d1040c08a713d3fd53ae59d86
parent7185eb7e63b22bbf485fbcd0d1e046a633b9019b (diff)
downloadfocaccia-qemu-cdcb78dba4d2c52bc80c37c2149e0a090ab6a6b2.tar.gz
focaccia-qemu-cdcb78dba4d2c52bc80c37c2149e0a090ab6a6b2.zip
hw/misc: remove break after g_assert_not_reached()
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>
-rw-r--r--hw/misc/imx6_ccm.c1
-rw-r--r--hw/misc/mac_via.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/hw/misc/imx6_ccm.c b/hw/misc/imx6_ccm.c
index 4b23ef19cd..7d522ed7c5 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;
     }