[PATCH v4 3/4] gdbstub: Move gdb-xml/ within gdbstub/

Philippe Mathieu-Daudé posted 4 patches 2 days, 22 hours ago
Maintainers: Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, Laurent Vivier <laurent@vivier.eu>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Zhao Liu <zhao1.liu@intel.com>, Song Gao <gaosong@loongson.cn>, Bibo Mao <maobibo@loongson.cn>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Thomas Huth <thuth@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, Markus Armbruster <armbru@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>
[PATCH v4 3/4] gdbstub: Move gdb-xml/ within gdbstub/
Posted by Philippe Mathieu-Daudé 2 days, 22 hours ago
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é <philmd@linaro.org>
---
 MAINTAINERS                                   | 19 +++++++++----------
 docs/devel/codebase.rst                       |  2 --
 meson.build                                   |  2 +-
 {gdb-xml => gdbstub/gdb-xml}/aarch64-core.xml |  0
 {gdb-xml => gdbstub/gdb-xml}/aarch64-fpu.xml  |  0
 {gdb-xml => gdbstub/gdb-xml}/aarch64-mte.xml  |  0
 .../gdb-xml}/aarch64-pauth.xml                |  0
 {gdb-xml => gdbstub/gdb-xml}/aarch64-sme2.xml |  0
 {gdb-xml => gdbstub/gdb-xml}/alpha-core.xml   |  0
 {gdb-xml => gdbstub/gdb-xml}/arm-core.xml     |  0
 .../gdb-xml}/arm-m-profile-mve.xml            |  0
 .../gdb-xml}/arm-m-profile.xml                |  0
 {gdb-xml => gdbstub/gdb-xml}/arm-neon.xml     |  0
 .../gdb-xml}/arm-vfp-sysregs.xml              |  0
 {gdb-xml => gdbstub/gdb-xml}/arm-vfp.xml      |  0
 {gdb-xml => gdbstub/gdb-xml}/arm-vfp3.xml     |  0
 {gdb-xml => gdbstub/gdb-xml}/avr-cpu.xml      |  0
 {gdb-xml => gdbstub/gdb-xml}/cf-core.xml      |  0
 {gdb-xml => gdbstub/gdb-xml}/cf-fp.xml        |  0
 {gdb-xml => gdbstub/gdb-xml}/hexagon-core.xml |  0
 {gdb-xml => gdbstub/gdb-xml}/hexagon-hvx.xml  |  0
 .../gdb-xml}/i386-32bit-linux.xml             |  0
 {gdb-xml => gdbstub/gdb-xml}/i386-32bit.xml   |  0
 .../gdb-xml}/i386-64bit-apx.xml               |  0
 .../gdb-xml}/i386-64bit-linux.xml             |  0
 {gdb-xml => gdbstub/gdb-xml}/i386-64bit.xml   |  0
 .../gdb-xml}/loongarch-base32.xml             |  0
 .../gdb-xml}/loongarch-base64.xml             |  0
 .../gdb-xml}/loongarch-fpu.xml                |  0
 .../gdb-xml}/loongarch-lasx.xml               |  0
 .../gdb-xml}/loongarch-lsx.xml                |  0
 {gdb-xml => gdbstub/gdb-xml}/m68k-core.xml    |  0
 {gdb-xml => gdbstub/gdb-xml}/m68k-fp.xml      |  0
 .../gdb-xml}/microblaze-core.xml              |  0
 .../gdb-xml}/microblaze-stack-protect.xml     |  0
 {gdb-xml => gdbstub/gdb-xml}/or1k-core.xml    |  0
 .../gdb-xml}/power-altivec.xml                |  0
 {gdb-xml => gdbstub/gdb-xml}/power-core.xml   |  0
 {gdb-xml => gdbstub/gdb-xml}/power-fpu.xml    |  0
 {gdb-xml => gdbstub/gdb-xml}/power-spe.xml    |  0
 {gdb-xml => gdbstub/gdb-xml}/power-vsx.xml    |  0
 {gdb-xml => gdbstub/gdb-xml}/power64-core.xml |  0
 .../gdb-xml}/riscv-32bit-cpu.xml              |  0
 .../gdb-xml}/riscv-32bit-fpu.xml              |  0
 .../gdb-xml}/riscv-32bit-virtual.xml          |  0
 .../gdb-xml}/riscv-64bit-cpu.xml              |  0
 .../gdb-xml}/riscv-64bit-fpu.xml              |  0
 .../gdb-xml}/riscv-64bit-virtual.xml          |  0
 {gdb-xml => gdbstub/gdb-xml}/rx-core.xml      |  0
 {gdb-xml => gdbstub/gdb-xml}/s390-acr.xml     |  0
 {gdb-xml => gdbstub/gdb-xml}/s390-cr.xml      |  0
 {gdb-xml => gdbstub/gdb-xml}/s390-fpr.xml     |  0
 {gdb-xml => gdbstub/gdb-xml}/s390-gs.xml      |  0
 .../gdb-xml}/s390-virt-kvm.xml                |  0
 {gdb-xml => gdbstub/gdb-xml}/s390-virt.xml    |  0
 {gdb-xml => gdbstub/gdb-xml}/s390-vx.xml      |  0
 {gdb-xml => gdbstub/gdb-xml}/s390x-core64.xml |  0
 {gdb-xml => gdbstub/gdb-xml}/sparc32-cp0.xml  |  0
 {gdb-xml => gdbstub/gdb-xml}/sparc32-cpu.xml  |  0
 {gdb-xml => gdbstub/gdb-xml}/sparc32-fpu.xml  |  0
 {gdb-xml => gdbstub/gdb-xml}/sparc64-cp0.xml  |  0
 {gdb-xml => gdbstub/gdb-xml}/sparc64-cpu.xml  |  0
 {gdb-xml => gdbstub/gdb-xml}/sparc64-fpu.xml  |  0
 63 files changed, 10 insertions(+), 13 deletions(-)
 rename {gdb-xml => gdbstub/gdb-xml}/aarch64-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/aarch64-fpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/aarch64-mte.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/aarch64-pauth.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/aarch64-sme2.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/alpha-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/arm-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/arm-m-profile-mve.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/arm-m-profile.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/arm-neon.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/arm-vfp-sysregs.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/arm-vfp.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/arm-vfp3.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/avr-cpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/cf-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/cf-fp.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/hexagon-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/hexagon-hvx.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/i386-32bit-linux.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/i386-32bit.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/i386-64bit-apx.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/i386-64bit-linux.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/i386-64bit.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/loongarch-base32.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/loongarch-base64.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/loongarch-fpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/loongarch-lasx.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/loongarch-lsx.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/m68k-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/m68k-fp.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/microblaze-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/microblaze-stack-protect.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/or1k-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/power-altivec.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/power-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/power-fpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/power-spe.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/power-vsx.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/power64-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/riscv-32bit-cpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/riscv-32bit-fpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/riscv-32bit-virtual.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/riscv-64bit-cpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/riscv-64bit-fpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/riscv-64bit-virtual.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/rx-core.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/s390-acr.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/s390-cr.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/s390-fpr.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/s390-gs.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/s390-virt-kvm.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/s390-virt.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/s390-vx.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/s390x-core64.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/sparc32-cp0.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/sparc32-cpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/sparc32-fpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/sparc64-cp0.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/sparc64-cpu.xml (100%)
 rename {gdb-xml => gdbstub/gdb-xml}/sparc64-fpu.xml (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 606b16762cf..fd316018b68 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -106,7 +106,7 @@ M: Thomas Huth <thuth@redhat.com>
 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
@@ -214,8 +214,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 <eric.auger@redhat.com>
@@ -230,7 +230,7 @@ AVR TCG CPUs
 M: Michael Rolnik <mrolnik@gmail.com>
 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/
 
@@ -245,7 +245,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
@@ -304,7 +304,7 @@ M: Stafford Horne <shorne@gmail.com>
 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
@@ -403,7 +403,7 @@ M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
 M: Artyom Tarasenko <atar4qemu@gmail.com>
 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
@@ -491,7 +491,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
 
@@ -1348,7 +1348,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
 -------------
@@ -3299,7 +3299,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 <https://www.linux-kvm.org/page/VirtFS>`_ support.
 * `gdbstub <https://gitlab.com/qemu-project/qemu/-/tree/master/gdbstub>`_:
   `GDB <GDB usage>` support.
-* `gdb-xml <https://gitlab.com/qemu-project/qemu/-/tree/master/gdb-xml>`_:
-  Set of XML files describing architectures and used by `gdbstub <GDB usage>`.
 * `host <https://gitlab.com/qemu-project/qemu/-/tree/master/host>`_:
   Various architecture specific header files (crypto, atomic, memory
   operations).
diff --git a/meson.build b/meson.build
index 42f9cfb5512..56a746fed00 100644
--- a/meson.build
+++ b/meson.build
@@ -4304,7 +4304,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',
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
-- 
2.52.0


Re: [PATCH v4 3/4] gdbstub: Move gdb-xml/ within gdbstub/
Posted by Alex Bennée 2 days, 19 hours ago
Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> 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é <philmd@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro
Re: [PATCH v4 3/4] gdbstub: Move gdb-xml/ within gdbstub/
Posted by Manos Pitsidianakis 2 days, 21 hours ago
On Fri, Feb 27, 2026 at 12:44 PM Philippe Mathieu-Daudé
<philmd@linaro.org> wrote:
>
> 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é <philmd@linaro.org>
> ---

Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

>  MAINTAINERS                                   | 19 +++++++++----------
>  docs/devel/codebase.rst                       |  2 --
>  meson.build                                   |  2 +-
>  {gdb-xml => gdbstub/gdb-xml}/aarch64-core.xml |  0
>  {gdb-xml => gdbstub/gdb-xml}/aarch64-fpu.xml  |  0
>  {gdb-xml => gdbstub/gdb-xml}/aarch64-mte.xml  |  0
>  .../gdb-xml}/aarch64-pauth.xml                |  0
>  {gdb-xml => gdbstub/gdb-xml}/aarch64-sme2.xml |  0
>  {gdb-xml => gdbstub/gdb-xml}/alpha-core.xml   |  0
>  {gdb-xml => gdbstub/gdb-xml}/arm-core.xml     |  0
>  .../gdb-xml}/arm-m-profile-mve.xml            |  0
>  .../gdb-xml}/arm-m-profile.xml                |  0
>  {gdb-xml => gdbstub/gdb-xml}/arm-neon.xml     |  0
>  .../gdb-xml}/arm-vfp-sysregs.xml              |  0
>  {gdb-xml => gdbstub/gdb-xml}/arm-vfp.xml      |  0
>  {gdb-xml => gdbstub/gdb-xml}/arm-vfp3.xml     |  0
>  {gdb-xml => gdbstub/gdb-xml}/avr-cpu.xml      |  0
>  {gdb-xml => gdbstub/gdb-xml}/cf-core.xml      |  0
>  {gdb-xml => gdbstub/gdb-xml}/cf-fp.xml        |  0
>  {gdb-xml => gdbstub/gdb-xml}/hexagon-core.xml |  0
>  {gdb-xml => gdbstub/gdb-xml}/hexagon-hvx.xml  |  0
>  .../gdb-xml}/i386-32bit-linux.xml             |  0
>  {gdb-xml => gdbstub/gdb-xml}/i386-32bit.xml   |  0
>  .../gdb-xml}/i386-64bit-apx.xml               |  0
>  .../gdb-xml}/i386-64bit-linux.xml             |  0
>  {gdb-xml => gdbstub/gdb-xml}/i386-64bit.xml   |  0
>  .../gdb-xml}/loongarch-base32.xml             |  0
>  .../gdb-xml}/loongarch-base64.xml             |  0
>  .../gdb-xml}/loongarch-fpu.xml                |  0
>  .../gdb-xml}/loongarch-lasx.xml               |  0
>  .../gdb-xml}/loongarch-lsx.xml                |  0
>  {gdb-xml => gdbstub/gdb-xml}/m68k-core.xml    |  0
>  {gdb-xml => gdbstub/gdb-xml}/m68k-fp.xml      |  0
>  .../gdb-xml}/microblaze-core.xml              |  0
>  .../gdb-xml}/microblaze-stack-protect.xml     |  0
>  {gdb-xml => gdbstub/gdb-xml}/or1k-core.xml    |  0
>  .../gdb-xml}/power-altivec.xml                |  0
>  {gdb-xml => gdbstub/gdb-xml}/power-core.xml   |  0
>  {gdb-xml => gdbstub/gdb-xml}/power-fpu.xml    |  0
>  {gdb-xml => gdbstub/gdb-xml}/power-spe.xml    |  0
>  {gdb-xml => gdbstub/gdb-xml}/power-vsx.xml    |  0
>  {gdb-xml => gdbstub/gdb-xml}/power64-core.xml |  0
>  .../gdb-xml}/riscv-32bit-cpu.xml              |  0
>  .../gdb-xml}/riscv-32bit-fpu.xml              |  0
>  .../gdb-xml}/riscv-32bit-virtual.xml          |  0
>  .../gdb-xml}/riscv-64bit-cpu.xml              |  0
>  .../gdb-xml}/riscv-64bit-fpu.xml              |  0
>  .../gdb-xml}/riscv-64bit-virtual.xml          |  0
>  {gdb-xml => gdbstub/gdb-xml}/rx-core.xml      |  0
>  {gdb-xml => gdbstub/gdb-xml}/s390-acr.xml     |  0
>  {gdb-xml => gdbstub/gdb-xml}/s390-cr.xml      |  0
>  {gdb-xml => gdbstub/gdb-xml}/s390-fpr.xml     |  0
>  {gdb-xml => gdbstub/gdb-xml}/s390-gs.xml      |  0
>  .../gdb-xml}/s390-virt-kvm.xml                |  0
>  {gdb-xml => gdbstub/gdb-xml}/s390-virt.xml    |  0
>  {gdb-xml => gdbstub/gdb-xml}/s390-vx.xml      |  0
>  {gdb-xml => gdbstub/gdb-xml}/s390x-core64.xml |  0
>  {gdb-xml => gdbstub/gdb-xml}/sparc32-cp0.xml  |  0
>  {gdb-xml => gdbstub/gdb-xml}/sparc32-cpu.xml  |  0
>  {gdb-xml => gdbstub/gdb-xml}/sparc32-fpu.xml  |  0
>  {gdb-xml => gdbstub/gdb-xml}/sparc64-cp0.xml  |  0
>  {gdb-xml => gdbstub/gdb-xml}/sparc64-cpu.xml  |  0
>  {gdb-xml => gdbstub/gdb-xml}/sparc64-fpu.xml  |  0
>  63 files changed, 10 insertions(+), 13 deletions(-)
>  rename {gdb-xml => gdbstub/gdb-xml}/aarch64-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/aarch64-fpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/aarch64-mte.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/aarch64-pauth.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/aarch64-sme2.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/alpha-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/arm-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/arm-m-profile-mve.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/arm-m-profile.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/arm-neon.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/arm-vfp-sysregs.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/arm-vfp.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/arm-vfp3.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/avr-cpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/cf-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/cf-fp.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/hexagon-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/hexagon-hvx.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/i386-32bit-linux.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/i386-32bit.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/i386-64bit-apx.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/i386-64bit-linux.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/i386-64bit.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/loongarch-base32.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/loongarch-base64.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/loongarch-fpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/loongarch-lasx.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/loongarch-lsx.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/m68k-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/m68k-fp.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/microblaze-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/microblaze-stack-protect.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/or1k-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/power-altivec.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/power-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/power-fpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/power-spe.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/power-vsx.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/power64-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/riscv-32bit-cpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/riscv-32bit-fpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/riscv-32bit-virtual.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/riscv-64bit-cpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/riscv-64bit-fpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/riscv-64bit-virtual.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/rx-core.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/s390-acr.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/s390-cr.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/s390-fpr.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/s390-gs.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/s390-virt-kvm.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/s390-virt.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/s390-vx.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/s390x-core64.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/sparc32-cp0.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/sparc32-cpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/sparc32-fpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/sparc64-cp0.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/sparc64-cpu.xml (100%)
>  rename {gdb-xml => gdbstub/gdb-xml}/sparc64-fpu.xml (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 606b16762cf..fd316018b68 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -106,7 +106,7 @@ M: Thomas Huth <thuth@redhat.com>
>  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
> @@ -214,8 +214,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 <eric.auger@redhat.com>
> @@ -230,7 +230,7 @@ AVR TCG CPUs
>  M: Michael Rolnik <mrolnik@gmail.com>
>  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/
>
> @@ -245,7 +245,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
> @@ -304,7 +304,7 @@ M: Stafford Horne <shorne@gmail.com>
>  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
> @@ -403,7 +403,7 @@ M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>  M: Artyom Tarasenko <atar4qemu@gmail.com>
>  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
> @@ -491,7 +491,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
>
> @@ -1348,7 +1348,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
>  -------------
> @@ -3299,7 +3299,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 <https://www.linux-kvm.org/page/VirtFS>`_ support.
>  * `gdbstub <https://gitlab.com/qemu-project/qemu/-/tree/master/gdbstub>`_:
>    `GDB <GDB usage>` support.
> -* `gdb-xml <https://gitlab.com/qemu-project/qemu/-/tree/master/gdb-xml>`_:
> -  Set of XML files describing architectures and used by `gdbstub <GDB usage>`.
>  * `host <https://gitlab.com/qemu-project/qemu/-/tree/master/host>`_:
>    Various architecture specific header files (crypto, atomic, memory
>    operations).
> diff --git a/meson.build b/meson.build
> index 42f9cfb5512..56a746fed00 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -4304,7 +4304,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',
> 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
> --
> 2.52.0
>
>