v2:
  - rebased patch 2 on current master
  - sanitized testing of -enable-fips in qemuxml2argvtest
  - reused existing QEMU_CAPS_ENABLE_FIPS flag with inverted logic
    (saves us from having to remove it later and also doesn't add new
     flag to new guests)
  - qemuxml2argvtest now tests the output, which is more obvious on
    qemu version bumps than qemucapabilitiestest

Daniel P. Berrangé (1):
  qemu: stop passing -enable-fips to QEMU >= 5.2.0

Peter Krempa (1):
  qemuxml2argvtest: Sanitize testing of '-enable-fips'

 src/qemu/qemu_capabilities.c                  |  7 ++++
 src/qemu/qemu_command.c                       | 12 +++++-
 src/qemu/qemu_command.h                       |  2 +-
 src/qemu/qemu_driver.c                        |  2 +-
 src/qemu/qemu_process.c                       |  2 +-
 .../caps_1.5.3.x86_64.xml                     |  1 +
 .../caps_1.6.0.x86_64.xml                     |  1 +
 .../caps_1.7.0.x86_64.xml                     |  1 +
 .../caps_2.1.1.x86_64.xml                     |  1 +
 .../caps_2.10.0.aarch64.xml                   |  1 +
 .../caps_2.10.0.ppc64.xml                     |  1 +
 .../caps_2.10.0.s390x.xml                     |  1 +
 .../caps_2.10.0.x86_64.xml                    |  1 +
 .../caps_2.11.0.s390x.xml                     |  1 +
 .../caps_2.11.0.x86_64.xml                    |  1 +
 .../caps_2.12.0.aarch64.xml                   |  1 +
 .../caps_2.12.0.ppc64.xml                     |  1 +
 .../caps_2.12.0.s390x.xml                     |  1 +
 .../caps_2.12.0.x86_64.xml                    |  1 +
 .../caps_2.4.0.x86_64.xml                     |  1 +
 .../caps_2.5.0.x86_64.xml                     |  1 +
 .../caps_2.6.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml |  1 +
 .../caps_2.6.0.x86_64.xml                     |  1 +
 .../qemucapabilitiesdata/caps_2.7.0.s390x.xml |  1 +
 .../caps_2.7.0.x86_64.xml                     |  1 +
 .../qemucapabilitiesdata/caps_2.8.0.s390x.xml |  1 +
 .../caps_2.8.0.x86_64.xml                     |  1 +
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml |  1 +
 .../qemucapabilitiesdata/caps_2.9.0.s390x.xml |  1 +
 .../caps_2.9.0.x86_64.xml                     |  1 +
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml |  1 +
 .../caps_3.0.0.riscv32.xml                    |  1 +
 .../caps_3.0.0.riscv64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_3.0.0.s390x.xml |  1 +
 .../caps_3.0.0.x86_64.xml                     |  1 +
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1 +
 .../caps_3.1.0.x86_64.xml                     |  1 +
 .../caps_4.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1 +
 .../caps_4.0.0.riscv32.xml                    |  1 +
 .../caps_4.0.0.riscv64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  1 +
 .../caps_4.0.0.x86_64.xml                     |  1 +
 .../caps_4.1.0.x86_64.xml                     |  1 +
 .../caps_4.2.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |  1 +
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |  1 +
 .../caps_4.2.0.x86_64.xml                     |  1 +
 .../caps_5.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |  1 +
 .../caps_5.0.0.riscv64.xml                    |  1 +
 .../caps_5.0.0.x86_64.xml                     |  1 +
 .../caps_5.1.0.x86_64.xml                     |  1 +
 .../caps_5.2.0.x86_64.xml                     |  1 +
 tests/qemuxml2argvdata/fips-enabled.args      | 31 --------------
 .../fips-enabled.x86_64-5.1.0.args            | 40 ++++++++++++++++++
 .../fips-enabled.x86_64-latest.args           | 41 +++++++++++++++++++
 tests/qemuxml2argvtest.c                      | 16 +++++---
 tests/testutilsqemu.h                         |  2 +-
 60 files changed, 163 insertions(+), 42 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/fips-enabled.args
 create mode 100644 tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args
 create mode 100644 tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args

-- 
2.26.2