[PATCH 00/10] More real qemu capability testing cleanups
Few other patches to move towards purely real qemu-caps testing. Peter Krempa (10): testutils: Print number of failed tests domaincapstest: Use obviously fake firmware name in capabilities testQemuGetRealCaps: Strip the default machine alias before insertion into cache testQemuGetRealCaps: Extract caching of the caps into a new helper testutilsqemu: Introduce 'testQemuInsertRealCaps' helper qemumemlocktest: Use 'testQemuInsertRealCaps' tests: qemudomainsnapshotxml2xmlout: Use real 'x86_64' capabilities in all test data qemuagenttest: Use real x86_64 capabilities for parsing domain definitions qemudomaincheckpointxml2xmltest: Use real 'x86_64' capabilities in all test data qemuTestDriverInit: Don't autopopulate qemu capabilities when initializing driver .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 5 +- .../qemu_4.2.0-virt.aarch64.xml | 5 +- tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 5 +- tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 5 +- .../qemu_5.0.0-tcg-virt.riscv64.xml | 5 +- .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 5 +- .../qemu_5.0.0-virt.aarch64.xml | 5 +- .../qemu_5.0.0-virt.riscv64.xml | 5 +- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_5.1.0.sparc.xml | 5 +- tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 +- .../qemu_5.2.0-tcg-virt.riscv64.xml | 5 +- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 5 +- .../qemu_5.2.0-virt.aarch64.xml | 5 +- .../qemu_5.2.0-virt.riscv64.xml | 5 +- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 5 +- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 5 +- .../qemu_6.0.0-virt.aarch64.xml | 5 +- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 +- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 5 +- .../qemu_6.2.0-virt.aarch64.xml | 5 +- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 5 +- .../qemu_7.0.0-hvf.aarch64+hvf.xml | 5 +- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 5 +- .../qemu_7.0.0-virt.aarch64.xml | 5 +- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 5 +- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 5 +- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 5 +- .../qemu_7.2.0-hvf.x86_64+hvf.xml | 5 +- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 5 +- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 5 +- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_7.2.0.ppc.xml | 5 +- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 5 +- .../qemu_8.0.0-tcg-virt.riscv64.xml | 5 +- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 5 +- .../qemu_8.0.0-virt.riscv64.xml | 5 +- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 5 +- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 5 +- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 5 +- tests/domaincapstest.c | 5 +- tests/qemuagentdata/fsinfo.xml | 4 +- tests/qemuagenttest.c | 8 ++ .../internal-active-invalid.xml | 4 +- .../internal-inactive-invalid.xml | 4 +- .../redefine.xml | 9 +- tests/qemudomaincheckpointxml2xmltest.c | 6 + .../disk_snapshot_redefine.xml | 9 +- .../external_vm_redefine.xml | 9 +- .../full_domain.xml | 9 +- .../qemudomainsnapshotxml2xmlout/metadata.xml | 9 +- tests/qemudomainsnapshotxml2xmltest.c | 6 + tests/qemumemlocktest.c | 19 +-- tests/testutils.c | 2 +- tests/testutilsqemu.c | 136 +++++++++++++----- tests/testutilsqemu.h | 10 ++ 84 files changed, 310 insertions(+), 279 deletions(-) -- 2.41.0
We can easily report how many tests failed. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index d77b9e8db2..e546422941 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -922,7 +922,7 @@ int virTestMain(int argc, if (ret == EXIT_FAILURE && !virBitmapIsAllClear(failedTests)) { g_autofree char *failed = virBitmapFormat(failedTests); - fprintf(stderr, "Some tests failed. Run them using:\n"); + fprintf(stderr, "%zu tests failed. Run them using:\n", virBitmapCountBits(failedTests)); fprintf(stderr, "VIR_TEST_DEBUG=1 VIR_TEST_RANGE=%s %s\n", failed, argv[0]); } -- 2.41.0
The domain capabilities data feature a firmware section which is filled by few entries. The entries used until now looked real and it was suspicious that a x86_64 host was listing aarch64 firmware images which should not happen. Fill it by an obviously fake path as it's not actually interpreted in a meaningful way. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0.sparc.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0.ppc.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 5 ++--- tests/domaincapstest.c | 5 ++--- 69 files changed, 138 insertions(+), 207 deletions(-) diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml index f408c2a969..ffde9506ec 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml index 4427634d7c..0dad4fda05 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml index 981a06856d..87a4921785 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml index 981a06856d..87a4921785 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml index a3289573bd..a09e6e07c4 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml index c35bed1326..ebef40479a 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml index cbe083f1f1..bfee062653 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml index 6b68d4f2a5..4d6d0ae6d9 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml index 20a8c9a583..d87115eaa1 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml index 39b1b4c1f2..53cc099b96 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml index f84aec44c9..55de5582d3 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml index 833cb4bb2e..6ed31714c2 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml @@ -7,9 +7,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml index f84aec44c9..55de5582d3 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml index 4b3f490942..9ae36313f4 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml index 603d842dfe..e21a4fef57 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml index cdbbe86ede..afc930ca97 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml index 8950900e72..52c4ab995c 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml index 6f92de2b6c..fc14338efc 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -7,9 +7,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml index 1ef28a71e4..4d0490ceb8 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml index 46a3a44cdd..6d0da1dee1 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml index 20a8c9a583..d87115eaa1 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml index edb622240e..678698b083 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml index af01bdfbe9..3f6cecbbab 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml index 833cb4bb2e..6ed31714c2 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml @@ -7,9 +7,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml index af01bdfbe9..3f6cecbbab 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml index b465ad1030..a92d0d3e43 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml index 9dbf118713..5348e0de4c 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml index 09db834535..b263d35c3b 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml index b1a2be10e6..bb7b2198fa 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml index 29b95a836f..855b5b7a54 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml index 67889c4572..15f729fe05 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml index 67889c4572..15f729fe05 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml index f0a8b196f5..d06b862185 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml index 693ae0a7f1..6530989fb2 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml index a161d6aa20..8a0bdd3b3b 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml index 7bfe6f802c..d12dfeeaac 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml index 8c4f8cc860..f55bd8df91 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml index 0449f562df..9b9603a460 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml index f15111c590..a657c54eff 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml index 241e893df6..e1c4e378a8 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml index 241e893df6..e1c4e378a8 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml index a9f7aefbc9..9176718e03 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml index fa1f7a2316..ac00ad791e 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml index bcabf66d2a..9758bb10c1 100644 --- a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml @@ -9,9 +9,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml index e793278d41..8ae50e06c0 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml index 6ff9df5766..41a8e8acaa 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml index 6aa5e78612..c7b636e5e9 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml index 6aa5e78612..c7b636e5e9 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml index 78f8d3cac4..145af975bf 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml index 1d1505f757..9a2117d829 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml index 047763bd43..e503607e7d 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml index b8621b5efd..0bc94b7913 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml index f3a436d859..2d116deeb1 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml index 95452bb0a4..67a767da38 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml index d6dc93d957..bf7013c359 100644 --- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml @@ -10,9 +10,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml index d0029c65da..75bfdfd1da 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index a5744e41fa..a6c4e0694a 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml index a5744e41fa..a6c4e0694a 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata/qemu_7.2.0.ppc.xml index 59ace0a0b2..d9d8ef49eb 100644 --- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml +++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml @@ -7,9 +7,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml index fecb7e4a0a..a8beb0654d 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml index ef2637ab26..a117fb04d5 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml index 5254d8807a..6491a61dab 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml @@ -8,9 +8,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml index cde1d70f09..8397c1ccc0 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml index 68aa0d6189..ff2679c4c1 100644 --- a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml @@ -7,9 +7,8 @@ <os supported='yes'> <enum name='firmware'/> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml index ebae9e34d6..3d09f77385 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index effa6f6630..c8dc6c390a 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index c36bac3fd2..0ff0f85e25 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 48e9444deb..a2060d69d1 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -11,9 +11,8 @@ <value>efi</value> </enum> <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <value>/obviously/fake/firmware1.fd</value> + <value>/obviously/fake/firmware2.fd</value> <enum name='type'> <value>rom</value> <value>pflash</value> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index ca4761aad0..c4a4508430 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -118,9 +118,8 @@ fillQemuCaps(virDomainCaps *domCaps, VIR_FREE(loader->values.values[--loader->values.nvalues]); if (fillStringValues(&loader->values, - "/usr/share/AAVMF/AAVMF_CODE.fd", - "/usr/share/AAVMF/AAVMF32_CODE.fd", - "/usr/share/OVMF/OVMF_CODE.fd", + "/obviously/fake/firmware1.fd", + "/obviously/fake/firmware2.fd", NULL) < 0) return -1; -- 2.41.0
On 7/4/23 15:40, Peter Krempa wrote:
The domain capabilities data feature a firmware section which is filled by few entries. The entries used until now looked real and it was suspicious that a x86_64 host was listing aarch64 firmware images which should not happen.
Fill it by an obviously fake path as it's not actually interpreted in a meaningful way.
Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0.sparc.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0.ppc.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 5 ++--- tests/domaincapstest.c | 5 ++--- 69 files changed, 138 insertions(+), 207 deletions(-)
You'll need to regenerate tests/domaincapsdata/qemu_8.1.0.s390x.xml which was pushed meanwhile. Michal
Expand the default machine type alias of the 'latest' capabilities for an architecture before caching it rather than after copying it, so that we don't duplicate the work all the time. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutilsqemu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index b75241d545..40c2cb8bba 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -931,14 +931,14 @@ testQemuGetRealCaps(const char *arch, return NULL; } + if (stripmachinealiases) + virQEMUCapsStripMachineAliases(cachedcaps); + g_hash_table_insert(capsCache, g_strdup(capsfile), cachedcaps); } ret = virQEMUCapsNewCopy(cachedcaps); - if (stripmachinealiases) - virQEMUCapsStripMachineAliases(ret); - /* strip 'xml' suffix so that we can format the file to '.replies' */ capsfile[strlen(capsfile) - 3] = '\0'; -- 2.41.0
Introduce testQemuGetRealCapsInternal that loads and caches the capabilities. testQemuGetRealCaps just copies the cache entry and returns it to the user. The new helper will be used in a helper that doesn't modify the capabilities and thus we don't need to copy it before use. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutilsqemu.c | 79 +++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 40c2cb8bba..0a42e59c59 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -876,37 +876,21 @@ testQemuInfoSetArgs(struct testQemuInfo *info, /** - * testQemuGetRealCaps: - * - * @arch: architecture to fetch caps for - * @version: qemu version to fetch caps for ("latest" for fetching the latest version from @capsLatestFiles) - * @variant: capabilities variant to fetch caps for - * @capsLatestFiles: hash table containing latest version of capabilities for the @arch+@variant tuple - * @capsCache: hash table filled with the cache of capabilities - * @schemaCache: hash table for caching QMP schemas (may be NULL, see below) - * @schema: Filled with the QMP schema (hash table) (may be NULL, see below) - * - * Fetches and returns the appropriate virQEMUCaps for the @arch+@version+@variant - * tuple. The returned pointer is a copy of the cached object and thus can - * be freely modified. Caller is responsible for freeing it. - * - * If @schemaCache and @schema are non-NULL, @schema is filled with with a - * pointer (borrowed from the cache) to the hash table representing the QEMU QMP - * schema used for validation of the monitor traffic. + * See testQemuGetRealCaps, this helper returns the pointer to the virQEMUCaps + * object as stored in the cache hash table. */ -virQEMUCaps * -testQemuGetRealCaps(const char *arch, - const char *version, - const char *variant, - GHashTable *capsLatestFiles, - GHashTable *capsCache, - GHashTable *schemaCache, - GHashTable **schema) +static virQEMUCaps * +testQemuGetRealCapsInternal(const char *arch, + const char *version, + const char *variant, + GHashTable *capsLatestFiles, + GHashTable *capsCache, + GHashTable *schemaCache, + GHashTable **schema) { g_autofree char *capsfile = NULL; bool stripmachinealiases = false; virQEMUCaps *cachedcaps = NULL; - virQEMUCaps *ret = NULL; if (STREQ(version, "latest")) { g_autofree char *archvariant = g_strdup_printf("%s%s", arch, variant); @@ -937,8 +921,6 @@ testQemuGetRealCaps(const char *arch, g_hash_table_insert(capsCache, g_strdup(capsfile), cachedcaps); } - ret = virQEMUCapsNewCopy(cachedcaps); - /* strip 'xml' suffix so that we can format the file to '.replies' */ capsfile[strlen(capsfile) - 3] = '\0'; @@ -951,7 +933,46 @@ testQemuGetRealCaps(const char *arch, } } - return ret; + return cachedcaps; +} + + +/** + * testQemuGetRealCaps: + * + * @arch: architecture to fetch caps for + * @version: qemu version to fetch caps for ("latest" for fetching the latest version from @capsLatestFiles) + * @variant: capabilities variant to fetch caps for + * @capsLatestFiles: hash table containing latest version of capabilities for the @arch+@variant tuple + * @capsCache: hash table filled with the cache of capabilities + * @schemaCache: hash table for caching QMP schemas (may be NULL, see below) + * @schema: Filled with the QMP schema (hash table) (may be NULL, see below) + * + * Fetches and returns the appropriate virQEMUCaps for the @arch+@version+@variant + * tuple. The returned pointer is a copy of the cached object and thus can + * be freely modified. Caller is responsible for freeing it. + * + * If @schemaCache and @schema are non-NULL, @schema is filled with with a + * pointer (borrowed from the cache) to the hash table representing the QEMU QMP + * schema used for validation of the monitor traffic. + */ +virQEMUCaps * +testQemuGetRealCaps(const char *arch, + const char *version, + const char *variant, + GHashTable *capsLatestFiles, + GHashTable *capsCache, + GHashTable *schemaCache, + GHashTable **schema) +{ + virQEMUCaps *cachedcaps; + + if (!(cachedcaps = testQemuGetRealCapsInternal(arch, version, variant, + capsLatestFiles, capsCache, + schemaCache, schema))) + return NULL; + + return virQEMUCapsNewCopy(cachedcaps); } -- 2.41.0
'testQemuInsertRealCaps' looks up and inserts real capabilities into the capability 'file cache' for testing purposes. Effectively this helper replaces following steps: 1) testQemuGetRealCaps 2) virFileCacheClear 3) qemuTestCapsCacheInsert This helper doesn't copy the capabilities that are borrowed from it's internal cache thus they must not be modified afterwards in contrast to the above steps. The use of this helper is in simple tests which require some form of capabilities to parse a definition but don't care about doctoring them in any way. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutilsqemu.c | 45 +++++++++++++++++++++++++++++++++++++++++++ tests/testutilsqemu.h | 10 ++++++++++ 2 files changed, 55 insertions(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 0a42e59c59..e0b58b1d5d 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -976,6 +976,51 @@ testQemuGetRealCaps(const char *arch, } +/** + * testQemuInsertRealCaps: + * + * @arch: architecture to fetch caps for + * @version: qemu version to fetch caps for ("latest" for fetching the latest version from @capsLatestFiles) + * @variant: capabilities variant to fetch caps for + * @capsLatestFiles: hash table containing latest version of capabilities for the @arch+@variant tuple + * @capsCache: hash table filled with the cache of capabilities + * @schemaCache: hash table for caching QMP schemas (may be NULL, see below) + * @schema: Filled with the QMP schema (hash table) (may be NULL, see below) + * + * Fetches and inserts into the test capability cache the appropriate virQEMUCaps + * for the @arch+@version+@variant tuple. Note that the data inserted into + * the cache is borrowed from the cache thus must not be further modified. + * + * If @schemaCache and @schema are non-NULL, @schema is filled with with a + * pointer (borrowed from the cache) to the hash table representing the QEMU QMP + * schema used for validation of the monitor traffic. + */ +int +testQemuInsertRealCaps(virFileCache *cache, + const char *arch, + const char *version, + const char *variant, + GHashTable *capsLatestFiles, + GHashTable *capsCache, + GHashTable *schemaCache, + GHashTable **schema) +{ + virQEMUCaps *cachedcaps; + + virFileCacheClear(cache); + + if (!(cachedcaps = testQemuGetRealCapsInternal(arch, version, variant, + capsLatestFiles, capsCache, + schemaCache, schema))) + return -1; + + if (qemuTestCapsCacheInsertData(cache, virQEMUCapsGetBinary(cachedcaps), cachedcaps) < 0) + return -1; + + return 0; +} + + int testQemuInfoInitArgs(struct testQemuInfo *info) { diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 1e6611daa3..e0d116336e 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -160,4 +160,14 @@ testQemuGetRealCaps(const char *arch, GHashTable *capsCache, GHashTable *schemaCache, GHashTable **schema); + +int +testQemuInsertRealCaps(virFileCache *cache, + const char *arch, + const char *version, + const char *variant, + GHashTable *capsLatestFiles, + GHashTable *capsCache, + GHashTable *schemaCache, + GHashTable **schema); #endif -- 2.41.0
Rewrite the capability fetching to use the new helper, thus simplifying the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemumemlocktest.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 7d219fcc40..a2888732f7 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -47,14 +47,8 @@ mymain(void) { g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); - g_autoptr(virQEMUCaps) qemuCaps_x86_64 = NULL; - g_autoptr(virQEMUCaps) qemuCaps_ppc64 = NULL; int ret = 0; - if (!(qemuCaps_x86_64 = testQemuGetRealCaps("x86_64", "latest", "", capslatest, capscache, NULL, NULL)) || - !(qemuCaps_ppc64 = testQemuGetRealCaps("ppc64", "latest", "", capslatest, capscache, NULL, NULL))) - return EXIT_FAILURE; - if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; @@ -85,11 +79,11 @@ mymain(void) qemuTestSetHostArch(&driver, VIR_ARCH_X86_64); - virFileCacheClear(driver.qemuCapsCache); - if (qemuTestCapsCacheInsert(driver.qemuCapsCache, qemuCaps_x86_64) < 0) { + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "", + capslatest, capscache, NULL, NULL) < 0) { ret = -1; goto cleanup; - }; + } DO_TEST("pc-kvm", 0); DO_TEST("pc-tcg", 0); @@ -105,11 +99,12 @@ mymain(void) DO_TEST("pc-locked+hostdev", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED); qemuTestSetHostArch(&driver, VIR_ARCH_PPC64); - virFileCacheClear(driver.qemuCapsCache); - if (qemuTestCapsCacheInsert(driver.qemuCapsCache, qemuCaps_ppc64) < 0) { + + if (testQemuInsertRealCaps(driver.qemuCapsCache, "ppc64", "latest", "", + capslatest, capscache, NULL, NULL) < 0) { ret = -1; goto cleanup; - }; + } DO_TEST("pseries-kvm", 20971520); DO_TEST("pseries-tcg", 0); -- 2.41.0
Use the platform which is getting most development for the snapshot XML examples so that it's tested against latest capabilities. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../disk_snapshot_redefine.xml | 9 ++++++--- .../external_vm_redefine.xml | 9 ++++++--- tests/qemudomainsnapshotxml2xmlout/full_domain.xml | 9 ++++++--- tests/qemudomainsnapshotxml2xmlout/metadata.xml | 9 ++++++--- tests/qemudomainsnapshotxml2xmltest.c | 6 ++++++ 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml index 24b41ba7c5..736a260eab 100644 --- a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml +++ b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml @@ -31,15 +31,18 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> @@ -76,7 +79,7 @@ <target dev='hdf' bus='ide'/> <address type='drive' controller='0' bus='5' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml index eae4691c1c..da717cb236 100644 --- a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml +++ b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml @@ -21,22 +21,25 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk' snapshot='no'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml index 1ddaa2a9aa..643f20269b 100644 --- a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml +++ b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml @@ -14,22 +14,25 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemudomainsnapshotxml2xmlout/metadata.xml b/tests/qemudomainsnapshotxml2xmlout/metadata.xml index 4b14c9efde..3fae6aa9e4 100644 --- a/tests/qemudomainsnapshotxml2xmlout/metadata.xml +++ b/tests/qemudomainsnapshotxml2xmlout/metadata.xml @@ -18,22 +18,25 @@ <currentMemory unit='KiB'>219100</currentMemory> <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapshotxml2xmltest.c index a09404a9d5..035c275b14 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -109,11 +109,17 @@ testCompareXMLToXMLHelper(const void *data) static int mymain(void) { + g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); + g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); int ret = 0; if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "", + capslatest, capscache, NULL, NULL) < 0) + return EXIT_FAILURE; + virDomainXMLOptionSetMomentPostParse(driver.xmlopt, testSnapshotPostParse); -- 2.41.0
Some test cases require a real definition and thus parse a XML with the definition to obtain it. Convert the code to use real capabilities and switch to x86_64. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuagentdata/fsinfo.xml | 4 ++-- tests/qemuagenttest.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/qemuagentdata/fsinfo.xml b/tests/qemuagentdata/fsinfo.xml index 233968fc29..914c2828c6 100644 --- a/tests/qemuagentdata/fsinfo.xml +++ b/tests/qemuagentdata/fsinfo.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -13,7 +13,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <source file='/tmp/idedisk.img'/> <target dev='hdc' bus='ide'/> diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 3c24a3139f..3287880241 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1359,11 +1359,19 @@ testQemuAgentTimezone(const void *data) static int mymain(void) { + g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); + g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); int ret = 0; if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; + /* Some test cases need a real definition thus parse a XML. We need + * qemu capabilities for that. */ + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "", + capslatest, capscache, NULL, NULL) < 0) + return EXIT_FAILURE; + virEventRegisterDefaultImpl(); #define DO_TEST(name) \ -- 2.41.0
Use the platform which is getting most development for the checkpoint XML examples so that it's tested against latest capabilities. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../internal-active-invalid.xml | 4 ++-- .../internal-inactive-invalid.xml | 4 ++-- tests/qemudomaincheckpointxml2xmlout/redefine.xml | 9 ++++++--- tests/qemudomaincheckpointxml2xmltest.c | 6 ++++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml index 2b6d8298c2..a31bf14500 100644 --- a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml +++ b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml @@ -16,7 +16,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/data.img'/> diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml index 427df0b4cf..ec51bc02ce 100644 --- a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml +++ b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml @@ -16,7 +16,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> @@ -24,7 +24,7 @@ <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/data.img'/> diff --git a/tests/qemudomaincheckpointxml2xmlout/redefine.xml b/tests/qemudomaincheckpointxml2xmlout/redefine.xml index b7c9d9dc6c..6b60b267fc 100644 --- a/tests/qemudomaincheckpointxml2xmlout/redefine.xml +++ b/tests/qemudomaincheckpointxml2xmlout/redefine.xml @@ -14,15 +14,18 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> + <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> @@ -48,7 +51,7 @@ <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='ide' index='0'> diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomaincheckpointxml2xmltest.c index d49dcd9143..0e195dae8d 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -131,11 +131,17 @@ testCompareXMLToXMLHelper(const void *data) static int mymain(void) { + g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps(); + g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref); int ret = 0; if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "", + capslatest, capscache, NULL, NULL) < 0) + return EXIT_FAILURE; + virDomainXMLOptionSetMomentPostParse(driver.xmlopt, testCheckpointPostParse); -- 2.41.0
In an effort to use strictly real capability testing all tests were converted to do insertion of their own capabilities when required, thus we don't need to popluate the capabilities. This will also promote using proper capabilities based on what the test is trying to achieve. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutilsqemu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index e0b58b1d5d..16b773a768 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -428,7 +428,6 @@ int qemuTestDriverInit(virQEMUDriver *driver) virSecurityManager *mgr = NULL; char statedir[] = STATEDIRTEMPLATE; char configdir[] = CONFIGDIRTEMPLATE; - g_autoptr(virQEMUCaps) emptyCaps = NULL; memset(driver, 0, sizeof(*driver)); @@ -499,11 +498,6 @@ int qemuTestDriverInit(virQEMUDriver *driver) if (!driver->xmlopt) goto error; - /* Populate the capabilities cache with fake empty caps */ - emptyCaps = virQEMUCapsNew(); - if (qemuTestCapsCacheInsert(driver->qemuCapsCache, emptyCaps) < 0) - goto error; - if (!(mgr = virSecurityManagerNew("none", "qemu", VIR_SECURITY_MANAGER_PRIVILEGED))) goto error; -- 2.41.0
On 7/4/23 15:40, Peter Krempa wrote:
Few other patches to move towards purely real qemu-caps testing.
Peter Krempa (10): testutils: Print number of failed tests domaincapstest: Use obviously fake firmware name in capabilities testQemuGetRealCaps: Strip the default machine alias before insertion into cache testQemuGetRealCaps: Extract caching of the caps into a new helper testutilsqemu: Introduce 'testQemuInsertRealCaps' helper qemumemlocktest: Use 'testQemuInsertRealCaps' tests: qemudomainsnapshotxml2xmlout: Use real 'x86_64' capabilities in all test data qemuagenttest: Use real x86_64 capabilities for parsing domain definitions qemudomaincheckpointxml2xmltest: Use real 'x86_64' capabilities in all test data qemuTestDriverInit: Don't autopopulate qemu capabilities when initializing driver
84 files changed, 310 insertions(+), 279 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Michal Prívozník -
Peter Krempa