On 8/25/2025 3:22 PM, Peter Krempa wrote:
On Mon, Aug 25, 2025 at 10:57:52 -0500, Praveen K Paladugu wrote:
Introduce mshv variant in capabilities tests.
Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com> --- .../caps_11.3.0_x86_64+mshv.replies | 46912 ++++++++++++++++ .../caps_11.3.0_x86_64+mshv.xml | 4996 ++ .../qemucaps2xmloutdata/caps.x86_64+mshv.xml | 29 + 3 files changed, 51937 insertions(+) create mode 100644 tests/qemucapabilitiesdata/caps_11.3.0_x86_64+mshv.replies create mode 100644 tests/qemucapabilitiesdata/caps_11.3.0_x86_64+mshv.xml create mode 100644 tests/qemucaps2xmloutdata/caps.x86_64+mshv.xml
Few issues:
1) the test-suite fails after this patch:
$ VIR_TEST_REGENERATE_OUTPUT=1 ./tests/domaincapstest TEST: domaincapstest ............................../home/pipo/libvirt/tests/domaincapsdata/qemu_11.3.0.x86_64+mshv.xml: failed to open: No such file or directory !/home/pipo/libvirt/tests/domaincapsdata/qemu_11.3.0-q35.x86_64+mshv.xml: failed to open: No such file or directory !/home/pipo/libvirt/tests/domaincapsdata/qemu_11.3.0-tcg.x86_64+mshv.xml: failed to open: No such file or directory !....... 40 .................................. 74 FAIL 3 tests failed. Run them using: VIR_TEST_DEBUG=1 VIR_TEST_RANGE=31-33 ./tests/domaincapstest
You seem to have forgotten to commit the two output files.
I didn't notice this failure among the other failures I am seeing with this test locally. I will investigate this further.
2) the filename of the caps dump is wrong:
diff --git a/tests/qemucapabilitiesdata/caps_11.3.0_x86_64+mshv.replies b/tests/qemucapabilitiesdata/caps_11.3.0_x86_64+mshv.replies
The upcoming qemu version is 10.1 so you can't really have qemu-11.3 at this point.
I noticed some files with caps_10.1.0_x86_64*** versioning. As Qemu version 10.1 was not released, I assumed this is libvirt version. I will fix this.
new file mode 100644 index 0000000000..2250e1a463 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_11.3.0_x86_64+mshv.replies @@ -0,0 +1,46912 @@ +{ + "execute": "qmp_capabilities", + "id": "libvirt-1" +} + +{ + "return": {}, + "id": "libvirt-1" +} + +{ + "execute": "query-version", + "id": "libvirt-2" +} + +{ + "return": { + "qemu": { + "micro": 92, + "minor": 0, + "major": 10 + }, + "package": "" + }, + "id": "libvirt-2"
3) beware that you're adding capabilities for the git version of qemu. That would normally mean that I'd have to ask you to confirm that you'll be able to update this dump once the release will be out.
Luckily qemu is at rc4 currently so the release is due very soon. Since also libvirt is at freeze you should be able to update this in the next version that will be needed to address the problems above without more backs&forths.
Makes sense. I am happy to update the version info here once the patches get merged in QEMU. >
4) The patch is missing update to tests/qemucapabilitiesdata/README.rst adding the description of the 'mshv' variant
5) I'd expect that you also add some qemuxmlconftest cases that use the new capabilities to show qemu commandline when mshv is in use (those would be separate but since this patch is the last in the series they obviously are not here)
I am discovering these things as I go. I have not looked into this test yet. I will investigate this further and add required tests. Regards, Praveen -- Regards, Praveen K Paladugu