See patch 1 for the rationale.

Peter Krempa (2):
  qemu_domain: Strip <acpi/> from s390(x) definitions
  qemuxmlconftest: Add tests for the ACPI stripping hack on s390

 src/qemu/qemu_domain.c                        | 94 +++++++++++++++++++
 .../aarch64-nousb-acpi.aarch64-latest.err     |  1 +
 tests/qemuxmlconfdata/aarch64-nousb-acpi.xml  | 18 ++++
 ...ngarch64-virt-acpi.loongarch64-latest.args | 31 ++++++
 ...ongarch64-virt-acpi.loongarch64-latest.xml | 26 +++++
 .../qemuxmlconfdata/loongarch64-virt-acpi.xml | 15 +++
 .../misc-acpi.x86_64-latest.args              | 34 -------
 .../misc-acpi.x86_64-latest.xml               | 41 --------
 tests/qemuxmlconfdata/misc-acpi.xml           | 33 -------
 .../riscv64-virt-acpi.riscv64-latest.args     | 33 +++++++
 .../riscv64-virt-acpi.riscv64-latest.xml      | 36 +++++++
 tests/qemuxmlconfdata/riscv64-virt-acpi.xml   | 15 +++
 .../s390x-ccw-acpi.s390x-latest.args          | 32 +++++++
 .../s390x-ccw-acpi.s390x-latest.xml           | 27 ++++++
 tests/qemuxmlconfdata/s390x-ccw-acpi.xml      | 15 +++
 .../x86_64-q35-acpi.x86_64-latest.args        | 38 ++++++++
 .../x86_64-q35-acpi.x86_64-latest.xml         | 53 +++++++++++
 tests/qemuxmlconfdata/x86_64-q35-acpi.xml     | 15 +++
 tests/qemuxmlconftest.c                       | 13 ++-
 19 files changed, 461 insertions(+), 109 deletions(-)
 create mode 100644 tests/qemuxmlconfdata/aarch64-nousb-acpi.aarch64-latest.err
 create mode 100644 tests/qemuxmlconfdata/aarch64-nousb-acpi.xml
 create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64-latest.args
 create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-acpi.loongarch64-latest.xml
 create mode 100644 tests/qemuxmlconfdata/loongarch64-virt-acpi.xml
 delete mode 100644 tests/qemuxmlconfdata/misc-acpi.x86_64-latest.args
 delete mode 100644 tests/qemuxmlconfdata/misc-acpi.x86_64-latest.xml
 delete mode 100644 tests/qemuxmlconfdata/misc-acpi.xml
 create mode 100644 tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.args
 create mode 100644 tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.xml
 create mode 100644 tests/qemuxmlconfdata/riscv64-virt-acpi.xml
 create mode 100644 tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args
 create mode 100644 tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.xml
 create mode 100644 tests/qemuxmlconfdata/s390x-ccw-acpi.xml
 create mode 100644 tests/qemuxmlconfdata/x86_64-q35-acpi.x86_64-latest.args
 create mode 100644 tests/qemuxmlconfdata/x86_64-q35-acpi.x86_64-latest.xml
 create mode 100644 tests/qemuxmlconfdata/x86_64-q35-acpi.xml

-- 
2.45.2