From: Philippe Mathieu-Daudé Date: Tue, 10 Mar 2026 23:20:43 +0000 (+0100) Subject: gdbstub: Move gdb-xml/ within gdbstub/ X-Git-Tag: v11.0.0-rc0~16^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39fb349f744df283adfdb6c42da74939b466da84;p=thirdparty%2Fqemu.git gdbstub: Move gdb-xml/ within gdbstub/ gdb-xml/ files are only consumed by gdbstub API. No need for a top-level entry, move them to gdbstub/. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Manos Pitsidianakis Reviewed-by: Alex Bennée Tested-by: Alex Bennée Acked-by: Alex Bennée Tested-by: Pierrick Bouvier Link: https://lore.kernel.org/qemu-devel/20260310232045.58440-16-philmd@linaro.org Signed-off-by: Pierrick Bouvier --- diff --git a/MAINTAINERS b/MAINTAINERS index 9d1614fd7e9..247799c817c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -106,7 +106,7 @@ M: Thomas Huth S: Supported F: configs/devices/s390x-softmmu/default.mak F: configs/targets/s390x-softmmu.mak -F: gdb-xml/s390*.xml +F: gdbstub/gdb-xml/s390*.xml F: hw/char/sclp*.[hc] F: hw/char/terminal3270.c F: hw/intc/s390_flic.c @@ -221,8 +221,8 @@ F: include/hw/cpu/a*mpcore.h F: docs/system/target-arm.rst F: docs/system/arm/cpu-features.rst F: docs/system/arm/emulation.rst -F: gdb-xml/arm*.xml -F: gdb-xml/aarch64*.xml +F: gdbstub/gdb-xml/arm*.xml +F: gdbstub/gdb-xml/aarch64*.xml ARM SMMU M: Eric Auger @@ -237,7 +237,7 @@ AVR TCG CPUs M: Michael Rolnik S: Maintained F: docs/system/target-avr.rst -F: gdb-xml/avr-cpu.xml +F: gdbstub/gdb-xml/avr-cpu.xml F: target/avr/ F: tests/functional/avr/ @@ -252,7 +252,7 @@ F: tests/tcg/hexagon/ F: disas/hexagon.c F: configs/targets/hexagon-linux-user/default.mak F: docker/dockerfiles/debian-hexagon-cross.docker -F: gdb-xml/hexagon*.xml +F: gdbstub/gdb-xml/hexagon*.xml T: git https://github.com/quic/qemu.git hex-next Hexagon idef-parser @@ -311,7 +311,7 @@ M: Stafford Horne S: Odd Fixes F: docs/system/or1k/cpu-features.rst F: target/or1k/ -F: gdb-xml/or1k-core.xml +F: gdbstub/gdb-xml/or1k-core.xml F: hw/or1k/ F: include/hw/or1k/ F: tests/functional/or1k/meson.build @@ -411,7 +411,7 @@ M: Mark Cave-Ayland M: Artyom Tarasenko S: Maintained F: target/sparc/ -F: gdb-xml/sparc*.xml +F: gdbstub/gdb-xml/sparc*.xml F: hw/sparc/ F: hw/sparc64/ F: include/hw/sparc/sparc64.h @@ -499,7 +499,7 @@ S: Supported F: target/s390x/kvm/ F: target/s390x/machine.c F: target/s390x/sigp.c -F: gdb-xml/s390*.xml +F: gdbstub/gdb-xml/s390*.xml T: git https://github.com/borntraeger/qemu.git s390-next L: qemu-s390x@nongnu.org @@ -1352,7 +1352,7 @@ F: include/hw/intc/loongson_ipi_common.h F: hw/intc/loongarch_*.c F: hw/intc/loongson_ipi_common.c F: hw/rtc/ls7a_rtc.c -F: gdb-xml/loongarch*.xml +F: gdbstub/gdb-xml/loongarch*.xml M68K Machines ------------- @@ -3311,7 +3311,6 @@ F: docs/system/gdb.rst F: gdbstub/* F: include/exec/gdbstub.h F: include/gdbstub/* -F: gdb-xml/ F: tests/tcg/multiarch/gdbstub/* F: scripts/feature_to_c.py F: scripts/probe-gdb-support.py diff --git a/docs/devel/codebase.rst b/docs/devel/codebase.rst index 69d88271178..f09307b8971 100644 --- a/docs/devel/codebase.rst +++ b/docs/devel/codebase.rst @@ -88,8 +88,6 @@ yet, so sometimes the source code is all you have. `VirtFS `_ support. * `gdbstub `_: `GDB ` support. -* `gdb-xml `_: - Set of XML files describing architectures and used by `gdbstub `. * `host `_: Various architecture specific header files (crypto, atomic, memory operations). diff --git a/gdb-xml/aarch64-core.xml b/gdbstub/gdb-xml/aarch64-core.xml similarity index 100% rename from gdb-xml/aarch64-core.xml rename to gdbstub/gdb-xml/aarch64-core.xml diff --git a/gdb-xml/aarch64-fpu.xml b/gdbstub/gdb-xml/aarch64-fpu.xml similarity index 100% rename from gdb-xml/aarch64-fpu.xml rename to gdbstub/gdb-xml/aarch64-fpu.xml diff --git a/gdb-xml/aarch64-mte.xml b/gdbstub/gdb-xml/aarch64-mte.xml similarity index 100% rename from gdb-xml/aarch64-mte.xml rename to gdbstub/gdb-xml/aarch64-mte.xml diff --git a/gdb-xml/aarch64-pauth.xml b/gdbstub/gdb-xml/aarch64-pauth.xml similarity index 100% rename from gdb-xml/aarch64-pauth.xml rename to gdbstub/gdb-xml/aarch64-pauth.xml diff --git a/gdb-xml/aarch64-sme2.xml b/gdbstub/gdb-xml/aarch64-sme2.xml similarity index 100% rename from gdb-xml/aarch64-sme2.xml rename to gdbstub/gdb-xml/aarch64-sme2.xml diff --git a/gdb-xml/alpha-core.xml b/gdbstub/gdb-xml/alpha-core.xml similarity index 100% rename from gdb-xml/alpha-core.xml rename to gdbstub/gdb-xml/alpha-core.xml diff --git a/gdb-xml/arm-core.xml b/gdbstub/gdb-xml/arm-core.xml similarity index 100% rename from gdb-xml/arm-core.xml rename to gdbstub/gdb-xml/arm-core.xml diff --git a/gdb-xml/arm-m-profile-mve.xml b/gdbstub/gdb-xml/arm-m-profile-mve.xml similarity index 100% rename from gdb-xml/arm-m-profile-mve.xml rename to gdbstub/gdb-xml/arm-m-profile-mve.xml diff --git a/gdb-xml/arm-m-profile.xml b/gdbstub/gdb-xml/arm-m-profile.xml similarity index 100% rename from gdb-xml/arm-m-profile.xml rename to gdbstub/gdb-xml/arm-m-profile.xml diff --git a/gdb-xml/arm-neon.xml b/gdbstub/gdb-xml/arm-neon.xml similarity index 100% rename from gdb-xml/arm-neon.xml rename to gdbstub/gdb-xml/arm-neon.xml diff --git a/gdb-xml/arm-vfp-sysregs.xml b/gdbstub/gdb-xml/arm-vfp-sysregs.xml similarity index 100% rename from gdb-xml/arm-vfp-sysregs.xml rename to gdbstub/gdb-xml/arm-vfp-sysregs.xml diff --git a/gdb-xml/arm-vfp.xml b/gdbstub/gdb-xml/arm-vfp.xml similarity index 100% rename from gdb-xml/arm-vfp.xml rename to gdbstub/gdb-xml/arm-vfp.xml diff --git a/gdb-xml/arm-vfp3.xml b/gdbstub/gdb-xml/arm-vfp3.xml similarity index 100% rename from gdb-xml/arm-vfp3.xml rename to gdbstub/gdb-xml/arm-vfp3.xml diff --git a/gdb-xml/avr-cpu.xml b/gdbstub/gdb-xml/avr-cpu.xml similarity index 100% rename from gdb-xml/avr-cpu.xml rename to gdbstub/gdb-xml/avr-cpu.xml diff --git a/gdb-xml/cf-core.xml b/gdbstub/gdb-xml/cf-core.xml similarity index 100% rename from gdb-xml/cf-core.xml rename to gdbstub/gdb-xml/cf-core.xml diff --git a/gdb-xml/cf-fp.xml b/gdbstub/gdb-xml/cf-fp.xml similarity index 100% rename from gdb-xml/cf-fp.xml rename to gdbstub/gdb-xml/cf-fp.xml diff --git a/gdb-xml/hexagon-core.xml b/gdbstub/gdb-xml/hexagon-core.xml similarity index 100% rename from gdb-xml/hexagon-core.xml rename to gdbstub/gdb-xml/hexagon-core.xml diff --git a/gdb-xml/hexagon-hvx.xml b/gdbstub/gdb-xml/hexagon-hvx.xml similarity index 100% rename from gdb-xml/hexagon-hvx.xml rename to gdbstub/gdb-xml/hexagon-hvx.xml diff --git a/gdb-xml/i386-32bit-linux.xml b/gdbstub/gdb-xml/i386-32bit-linux.xml similarity index 100% rename from gdb-xml/i386-32bit-linux.xml rename to gdbstub/gdb-xml/i386-32bit-linux.xml diff --git a/gdb-xml/i386-32bit.xml b/gdbstub/gdb-xml/i386-32bit.xml similarity index 100% rename from gdb-xml/i386-32bit.xml rename to gdbstub/gdb-xml/i386-32bit.xml diff --git a/gdb-xml/i386-64bit-apx.xml b/gdbstub/gdb-xml/i386-64bit-apx.xml similarity index 100% rename from gdb-xml/i386-64bit-apx.xml rename to gdbstub/gdb-xml/i386-64bit-apx.xml diff --git a/gdb-xml/i386-64bit-linux.xml b/gdbstub/gdb-xml/i386-64bit-linux.xml similarity index 100% rename from gdb-xml/i386-64bit-linux.xml rename to gdbstub/gdb-xml/i386-64bit-linux.xml diff --git a/gdb-xml/i386-64bit.xml b/gdbstub/gdb-xml/i386-64bit.xml similarity index 100% rename from gdb-xml/i386-64bit.xml rename to gdbstub/gdb-xml/i386-64bit.xml diff --git a/gdb-xml/loongarch-base32.xml b/gdbstub/gdb-xml/loongarch-base32.xml similarity index 100% rename from gdb-xml/loongarch-base32.xml rename to gdbstub/gdb-xml/loongarch-base32.xml diff --git a/gdb-xml/loongarch-base64.xml b/gdbstub/gdb-xml/loongarch-base64.xml similarity index 100% rename from gdb-xml/loongarch-base64.xml rename to gdbstub/gdb-xml/loongarch-base64.xml diff --git a/gdb-xml/loongarch-fpu.xml b/gdbstub/gdb-xml/loongarch-fpu.xml similarity index 100% rename from gdb-xml/loongarch-fpu.xml rename to gdbstub/gdb-xml/loongarch-fpu.xml diff --git a/gdb-xml/loongarch-lasx.xml b/gdbstub/gdb-xml/loongarch-lasx.xml similarity index 100% rename from gdb-xml/loongarch-lasx.xml rename to gdbstub/gdb-xml/loongarch-lasx.xml diff --git a/gdb-xml/loongarch-lsx.xml b/gdbstub/gdb-xml/loongarch-lsx.xml similarity index 100% rename from gdb-xml/loongarch-lsx.xml rename to gdbstub/gdb-xml/loongarch-lsx.xml diff --git a/gdb-xml/m68k-core.xml b/gdbstub/gdb-xml/m68k-core.xml similarity index 100% rename from gdb-xml/m68k-core.xml rename to gdbstub/gdb-xml/m68k-core.xml diff --git a/gdb-xml/m68k-fp.xml b/gdbstub/gdb-xml/m68k-fp.xml similarity index 100% rename from gdb-xml/m68k-fp.xml rename to gdbstub/gdb-xml/m68k-fp.xml diff --git a/gdb-xml/microblaze-core.xml b/gdbstub/gdb-xml/microblaze-core.xml similarity index 100% rename from gdb-xml/microblaze-core.xml rename to gdbstub/gdb-xml/microblaze-core.xml diff --git a/gdb-xml/microblaze-stack-protect.xml b/gdbstub/gdb-xml/microblaze-stack-protect.xml similarity index 100% rename from gdb-xml/microblaze-stack-protect.xml rename to gdbstub/gdb-xml/microblaze-stack-protect.xml diff --git a/gdb-xml/or1k-core.xml b/gdbstub/gdb-xml/or1k-core.xml similarity index 100% rename from gdb-xml/or1k-core.xml rename to gdbstub/gdb-xml/or1k-core.xml diff --git a/gdb-xml/power-altivec.xml b/gdbstub/gdb-xml/power-altivec.xml similarity index 100% rename from gdb-xml/power-altivec.xml rename to gdbstub/gdb-xml/power-altivec.xml diff --git a/gdb-xml/power-core.xml b/gdbstub/gdb-xml/power-core.xml similarity index 100% rename from gdb-xml/power-core.xml rename to gdbstub/gdb-xml/power-core.xml diff --git a/gdb-xml/power-fpu.xml b/gdbstub/gdb-xml/power-fpu.xml similarity index 100% rename from gdb-xml/power-fpu.xml rename to gdbstub/gdb-xml/power-fpu.xml diff --git a/gdb-xml/power-spe.xml b/gdbstub/gdb-xml/power-spe.xml similarity index 100% rename from gdb-xml/power-spe.xml rename to gdbstub/gdb-xml/power-spe.xml diff --git a/gdb-xml/power-vsx.xml b/gdbstub/gdb-xml/power-vsx.xml similarity index 100% rename from gdb-xml/power-vsx.xml rename to gdbstub/gdb-xml/power-vsx.xml diff --git a/gdb-xml/power64-core.xml b/gdbstub/gdb-xml/power64-core.xml similarity index 100% rename from gdb-xml/power64-core.xml rename to gdbstub/gdb-xml/power64-core.xml diff --git a/gdb-xml/riscv-32bit-cpu.xml b/gdbstub/gdb-xml/riscv-32bit-cpu.xml similarity index 100% rename from gdb-xml/riscv-32bit-cpu.xml rename to gdbstub/gdb-xml/riscv-32bit-cpu.xml diff --git a/gdb-xml/riscv-32bit-fpu.xml b/gdbstub/gdb-xml/riscv-32bit-fpu.xml similarity index 100% rename from gdb-xml/riscv-32bit-fpu.xml rename to gdbstub/gdb-xml/riscv-32bit-fpu.xml diff --git a/gdb-xml/riscv-32bit-virtual.xml b/gdbstub/gdb-xml/riscv-32bit-virtual.xml similarity index 100% rename from gdb-xml/riscv-32bit-virtual.xml rename to gdbstub/gdb-xml/riscv-32bit-virtual.xml diff --git a/gdb-xml/riscv-64bit-cpu.xml b/gdbstub/gdb-xml/riscv-64bit-cpu.xml similarity index 100% rename from gdb-xml/riscv-64bit-cpu.xml rename to gdbstub/gdb-xml/riscv-64bit-cpu.xml diff --git a/gdb-xml/riscv-64bit-fpu.xml b/gdbstub/gdb-xml/riscv-64bit-fpu.xml similarity index 100% rename from gdb-xml/riscv-64bit-fpu.xml rename to gdbstub/gdb-xml/riscv-64bit-fpu.xml diff --git a/gdb-xml/riscv-64bit-virtual.xml b/gdbstub/gdb-xml/riscv-64bit-virtual.xml similarity index 100% rename from gdb-xml/riscv-64bit-virtual.xml rename to gdbstub/gdb-xml/riscv-64bit-virtual.xml diff --git a/gdb-xml/rx-core.xml b/gdbstub/gdb-xml/rx-core.xml similarity index 100% rename from gdb-xml/rx-core.xml rename to gdbstub/gdb-xml/rx-core.xml diff --git a/gdb-xml/s390-acr.xml b/gdbstub/gdb-xml/s390-acr.xml similarity index 100% rename from gdb-xml/s390-acr.xml rename to gdbstub/gdb-xml/s390-acr.xml diff --git a/gdb-xml/s390-cr.xml b/gdbstub/gdb-xml/s390-cr.xml similarity index 100% rename from gdb-xml/s390-cr.xml rename to gdbstub/gdb-xml/s390-cr.xml diff --git a/gdb-xml/s390-fpr.xml b/gdbstub/gdb-xml/s390-fpr.xml similarity index 100% rename from gdb-xml/s390-fpr.xml rename to gdbstub/gdb-xml/s390-fpr.xml diff --git a/gdb-xml/s390-gs.xml b/gdbstub/gdb-xml/s390-gs.xml similarity index 100% rename from gdb-xml/s390-gs.xml rename to gdbstub/gdb-xml/s390-gs.xml diff --git a/gdb-xml/s390-virt-kvm.xml b/gdbstub/gdb-xml/s390-virt-kvm.xml similarity index 100% rename from gdb-xml/s390-virt-kvm.xml rename to gdbstub/gdb-xml/s390-virt-kvm.xml diff --git a/gdb-xml/s390-virt.xml b/gdbstub/gdb-xml/s390-virt.xml similarity index 100% rename from gdb-xml/s390-virt.xml rename to gdbstub/gdb-xml/s390-virt.xml diff --git a/gdb-xml/s390-vx.xml b/gdbstub/gdb-xml/s390-vx.xml similarity index 100% rename from gdb-xml/s390-vx.xml rename to gdbstub/gdb-xml/s390-vx.xml diff --git a/gdb-xml/s390x-core64.xml b/gdbstub/gdb-xml/s390x-core64.xml similarity index 100% rename from gdb-xml/s390x-core64.xml rename to gdbstub/gdb-xml/s390x-core64.xml diff --git a/gdb-xml/sparc32-cp0.xml b/gdbstub/gdb-xml/sparc32-cp0.xml similarity index 100% rename from gdb-xml/sparc32-cp0.xml rename to gdbstub/gdb-xml/sparc32-cp0.xml diff --git a/gdb-xml/sparc32-cpu.xml b/gdbstub/gdb-xml/sparc32-cpu.xml similarity index 100% rename from gdb-xml/sparc32-cpu.xml rename to gdbstub/gdb-xml/sparc32-cpu.xml diff --git a/gdb-xml/sparc32-fpu.xml b/gdbstub/gdb-xml/sparc32-fpu.xml similarity index 100% rename from gdb-xml/sparc32-fpu.xml rename to gdbstub/gdb-xml/sparc32-fpu.xml diff --git a/gdb-xml/sparc64-cp0.xml b/gdbstub/gdb-xml/sparc64-cp0.xml similarity index 100% rename from gdb-xml/sparc64-cp0.xml rename to gdbstub/gdb-xml/sparc64-cp0.xml diff --git a/gdb-xml/sparc64-cpu.xml b/gdbstub/gdb-xml/sparc64-cpu.xml similarity index 100% rename from gdb-xml/sparc64-cpu.xml rename to gdbstub/gdb-xml/sparc64-cpu.xml diff --git a/gdb-xml/sparc64-fpu.xml b/gdbstub/gdb-xml/sparc64-fpu.xml similarity index 100% rename from gdb-xml/sparc64-fpu.xml rename to gdbstub/gdb-xml/sparc64-fpu.xml diff --git a/meson.build b/meson.build index 8e8440941c0..503cde5ea90 100644 --- a/meson.build +++ b/meson.build @@ -4331,7 +4331,7 @@ foreach target : target_dirs if 'TARGET_XML_FILES' in config_target gdbstub_xml_files = [] foreach gdbstub_xml : config_target['TARGET_XML_FILES'].split() - gdbstub_xml_files += 'gdb-xml/' + gdbstub_xml + gdbstub_xml_files += 'gdbstub/gdb-xml/' + gdbstub_xml endforeach gdbstub_xml = custom_target(target + '-gdbstub-xml.c', output: target + '-gdbstub-xml.c',