Commit 3b6cf87d42 for qemu.org

commit 3b6cf87d420dbfd1c4dd357f0a0790e4c1609801
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date:   Wed Mar 11 00:20:34 2026 +0100

    gdbstub: Simplify gdb_init_cpu() logic

    Ensure we either set gdb_num_core_regs or have a XML file.
    We shouldn't modify CPUClass content, so mark it const.

    Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
    Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Tested-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
    Link: https://lore.kernel.org/qemu-devel/20260310232045.58440-7-philmd@linaro.org
    Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
index 90f4b95135..221951c22b 100644
--- a/gdbstub/gdbstub.c
+++ b/gdbstub/gdbstub.c
@@ -582,22 +582,20 @@ static const char *gdb_get_core_xml_file(CPUState *cpu)

 void gdb_init_cpu(CPUState *cpu)
 {
-    CPUClass *cc = cpu->cc;
+    const CPUClass *cc = cpu->cc;
     const GDBFeature *feature;
     const char *xmlfile = gdb_get_core_xml_file(cpu);

     cpu->gdb_regs = g_array_new(false, false, sizeof(GDBRegisterState));

     if (xmlfile) {
+        assert(!cc->gdb_num_core_regs);
         feature = gdb_find_static_feature(xmlfile);
         gdb_register_feature(cpu, 0,
                              cc->gdb_read_register, cc->gdb_write_register,
                              feature);
-        assert(!cc->gdb_num_core_regs);
         cpu->gdb_num_regs = cpu->gdb_num_g_regs = feature->num_regs;
-    }
-
-    if (cc->gdb_num_core_regs) {
+    } else {
         cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs;
     }
 }