See 1/2 for rationale:

Changes:
 - replace masive switch statement by a comment
 - don't strip the <acpi/> feature when _ABI_UPDATE is asserted
   (effectively on 'define'/'create' of a new config) to preserve errors
 - improve testing:
    - add less redundant tests
    - add comment about which other cases are testing relevant bits
    - add also a case for _ABI_UPDATE
    - fix comment and name in negative 'aarch64' test

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                        | 47 +++++++++++++++++++
 .../aarch64-noacpi-acpi.aarch64-latest.err    |  1 +
 tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml | 18 +++++++
 .../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.abi-update.err |  1 +
 .../s390x-ccw-acpi.s390x-latest.args          | 32 +++++++++++++
 .../s390x-ccw-acpi.s390x-latest.xml           | 27 +++++++++++
 tests/qemuxmlconfdata/s390x-ccw-acpi.xml      | 15 ++++++
 tests/qemuxmlconftest.c                       | 18 ++++++-
 14 files changed, 242 insertions(+), 109 deletions(-)
 create mode 100644 tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err
 create mode 100644 tests/qemuxmlconfdata/aarch64-noacpi-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.abi-update.err
 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

-- 
2.45.2