The idea of this series is to start cleaning out fake caps testing as much as possible in favor of real capabilities (as much as possible). The end goal is to replace all fake caps test cases with real caps. This series was inspired by the effort to remove/deprecate qemu-system-i386 and qemu-system-arm. This series cleans up less-tested arches and finishes off with cleaning out 'qemu-system-arm' Further work is with other arches which have far more fake tests. Peter Krempa (31): tests: domainschemadata: Drop redundant tests tests: qemu: Move testing of default cache and disk source with space to 'sata-device' util: virfilecache: Introduce virFileCacheClear for usage in tests qemuxml2argvtest: Fix serial-unix-missing-source case qemuTestCapsCacheInsert*: Drop the file cache rather than poisoning it qemuTestCapsCacheInsert*: Directly insert real capabilities qemuxml2argvtest: Convert 'sparc-minimal' case to DO_TEST_CAPS_ARCH_LATEST testutilsqemu: Drop support for fake-caps testing of 'sparc' architecture testutilsqemu: Unify array for filling fake machine types testutilsqemu: Drop support for fake-caps testing of 'riscv32' architecture qemu: capabilities: Don't make callers check return of virQEMUCapsNew(Binary) qemu: capabilities: Remove return value from virQEMUCaps(SEV|SGX)InfoCopy qemu: domain: Restructure control flow in qemuDomainFixupCPUs cpu: Remove return value from virCPUDefCopyModel(Filter) conf: cpu: Remove NULL check from virCPUDefCopyWithoutModel conf: cpu: Remove NULL check from virCPUDefCopy qemu: capabilities: Remove return value from virQEMUCapsHostCPUDataCopy qemu: capabilities: Remove return value from virQEMUCapsAccelCopy qemu: Remove return value checks from calls to virQEMUCapsNewCopy qemuTestCapsCacheInsertImpl: Require that callers always pass capabilities testutilsqemu: Rework setting of fake capabilities testutilsqemu: Introduce ARG_QEMU_CAPS_DEL, to mask out flags from real caps qemuxml2(argv|xml)test: Convert last fake-caps riscv64 tests to real caps testutilsqemu: Drop support for fake-caps testing of 'riscv64' architecture tests: qemu: Add 'ppc' machine caps based on 'qemu-system-ppc' on fedora qemuxml2argvdata: Convert test cases for 'ppc' architecture to latest caps testutilsqemu: Drop support for fake-caps testing of 'ppc' architecture qemu: Always assume QEMU_CAPS_CPU_AARCH64_OFF qemu: capabilities: Retire QEMU_CAPS_CPU_AARCH64_OFF tests: qemuxml2argvdata: Port 'qemu-system-arm' cases with fake tests to 'qemu-system-aarch64' testutilsqemu: Drop support for fake-caps testing of 'arm' architecture src/conf/cpu_conf.c | 19 +- src/conf/cpu_conf.h | 10 +- src/cpu/cpu_arm.c | 8 +- src/cpu/cpu_ppc64.c | 8 +- src/cpu/cpu_s390.c | 8 +- src/cpu/cpu_x86.c | 29 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 104 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_domain.c | 27 +- src/qemu/qemu_driver.c | 12 +- src/qemu/qemu_migration_cookie.c | 3 +- src/qemu/qemu_process.c | 12 +- src/qemu/qemu_validate.c | 9 - src/util/virfilecache.c | 16 + src/util/virfilecache.h | 4 + tests/cputest.c | 3 +- tests/domaincapsdata/qemu_7.2.0.ppc.xml | 158 + tests/domainschemadata/backing-chains.xml | 94 - tests/domainschemadata/default-cache-mode.xml | 26 - .../domain-disk-source-space.xml | 36 - tests/domainschemadata/maxMemory.xml | 19 - .../qemu-simple-description-title.xml | 27 - tests/domainschemadata/timers.xml | 28 - .../caps_4.2.0.aarch64.xml | 1 - .../caps_5.0.0.aarch64.xml | 1 - .../caps_5.2.0.aarch64.xml | 1 - .../caps_6.0.0.aarch64.xml | 1 - .../caps_6.2.0.aarch64.xml | 1 - .../caps_7.0.0.aarch64.xml | 1 - .../caps_7.2.0.ppc.replies | 32233 ++++++++++++++++ tests/qemucapabilitiesdata/caps_7.2.0.ppc.xml | 559 + tests/qemucapabilitiestest.c | 9 +- tests/qemucaps2xmloutdata/caps.ppc.xml | 25 + tests/qemucaps2xmltest.c | 3 +- tests/qemuhotplugtest.c | 3 +- tests/qemumemlocktest.c | 5 +- tests/qemusecuritytest.c | 2 + tests/qemustatusxml2xmltest.c | 2 + ... aarch64-kvm-32-on-64.aarch64-latest.args} | 15 +- .../qemuxml2argvdata/aarch64-kvm-32-on-64.err | 1 - .../qemuxml2argvdata/aarch64-kvm-32-on-64.xml | 2 +- ... arm-vexpressa9-basic.aarch64-latest.args} | 9 +- .../qemuxml2argvdata/arm-vexpressa9-basic.xml | 2 +- ...arm-vexpressa9-nodevs.aarch64-latest.args} | 9 +- .../arm-vexpressa9-nodevs.xml | 2 +- ...arm-vexpressa9-virtio.aarch64-latest.args} | 23 +- .../arm-vexpressa9-virtio.xml | 2 +- .../arm-virt-virtio.aarch64-latest.args | 54 + tests/qemuxml2argvdata/arm-virt-virtio.args | 45 - tests/qemuxml2argvdata/arm-virt-virtio.xml | 2 +- .../disk-sata-device.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-sata-device.xml | 3 +- .../{ppc-dtb.args => ppc-dtb.ppc-latest.args} | 12 +- tests/qemuxml2argvdata/ppc-dtb.xml | 2 +- ...al.args => ppce500-serial.ppc-latest.args} | 12 +- tests/qemuxml2argvdata/ppce500-serial.xml | 2 +- ...s => riscv64-virt-pci.riscv64-latest.args} | 8 +- ....args => riscv64-virt.riscv64-latest.args} | 10 +- .../serial-unix-missing-source.err | 1 - ...rial-unix-missing-source.x86_64-latest.err | 2 +- .../serial-unix-missing-source.xml | 4 +- ...l.args => sparc-minimal.sparc-latest.args} | 1 + tests/qemuxml2argvtest.c | 43 +- .../disk-sata-device.x86_64-latest.xml | 40 + ...ml => riscv64-virt-pci.riscv64-latest.xml} | 0 ...rt.xml => riscv64-virt.riscv64-latest.xml} | 20 +- tests/qemuxml2xmltest.c | 9 +- tests/securityselinuxlabeltest.c | 3 +- tests/testutilshostcpus.h | 10 + tests/testutilsqemu.c | 227 +- tests/testutilsqemu.h | 5 +- 72 files changed, 33400 insertions(+), 692 deletions(-) create mode 100644 tests/domaincapsdata/qemu_7.2.0.ppc.xml delete mode 100644 tests/domainschemadata/backing-chains.xml delete mode 100644 tests/domainschemadata/default-cache-mode.xml delete mode 100644 tests/domainschemadata/domain-disk-source-space.xml delete mode 100644 tests/domainschemadata/maxMemory.xml delete mode 100644 tests/domainschemadata/qemu-simple-description-title.xml delete mode 100644 tests/domainschemadata/timers.xml create mode 100644 tests/qemucapabilitiesdata/caps_7.2.0.ppc.replies create mode 100644 tests/qemucapabilitiesdata/caps_7.2.0.ppc.xml create mode 100644 tests/qemucaps2xmloutdata/caps.ppc.xml rename tests/qemuxml2argvdata/{aarch64-kvm-32-on-64.args => aarch64-kvm-32-on-64.aarch64-latest.args} (53%) delete mode 100644 tests/qemuxml2argvdata/aarch64-kvm-32-on-64.err rename tests/qemuxml2argvdata/{arm-vexpressa9-basic.args => arm-vexpressa9-basic.aarch64-latest.args} (71%) rename tests/qemuxml2argvdata/{arm-vexpressa9-nodevs.args => arm-vexpressa9-nodevs.aarch64-latest.args} (65%) rename tests/qemuxml2argvdata/{arm-vexpressa9-virtio.args => arm-vexpressa9-virtio.aarch64-latest.args} (54%) create mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.args rename tests/qemuxml2argvdata/{ppc-dtb.args => ppc-dtb.ppc-latest.args} (62%) rename tests/qemuxml2argvdata/{ppce500-serial.args => ppce500-serial.ppc-latest.args} (62%) rename tests/qemuxml2argvdata/{riscv64-virt-pci.args => riscv64-virt-pci.riscv64-latest.args} (67%) rename tests/qemuxml2argvdata/{riscv64-virt.args => riscv64-virt.riscv64-latest.args} (67%) delete mode 100644 tests/qemuxml2argvdata/serial-unix-missing-source.err rename tests/qemuxml2argvdata/{sparc-minimal.args => sparc-minimal.sparc-latest.args} (95%) create mode 100644 tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml rename tests/qemuxml2xmloutdata/{riscv64-virt-pci.xml => riscv64-virt-pci.riscv64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{riscv64-virt.xml => riscv64-virt.riscv64-latest.xml} (53%) -- 2.39.2