[PATCH 0/2] tests: Fix 'qemucapsprobe' and update caps for qemu-9.0 release
Peter Krempa (2): tests: qemucapsprobe: Fix construction of path to libqemucapsprobemock.so qemucapabilitiestest: Update qemu capability dump for qemu-9.0 release .../caps_9.0.0_x86_64.replies | 50 ++----------------- .../caps_9.0.0_x86_64.xml | 4 +- tests/qemucapsprobe.c | 2 +- 3 files changed, 7 insertions(+), 49 deletions(-) -- 2.44.0
Prior to commit eac646ea490e66 VIR_TEST_MOCK included the path to the build directory, but the code was not fixed after VIR_TEST_MOCK was changed resulting in the following failure when attempting to probe capaibilities: $ ./tests/qemucapsprobe /path/to/qemu/qemu-system-x86_64 > out libqemucapsprobemock.so: No such file or directory Fix the construction of the path to the mock library by concatenating it back with the absolute path to the build directory. Fixes: eac646ea490e66500609585047f0d800e3645d6b Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemucapsprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 76c18f0dcd..cd117170ab 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -48,7 +48,7 @@ main(int argc, char **argv) virQEMUCaps *caps; virArch host; virArch guest; - const char *mock = VIR_TEST_MOCK("qemucapsprobe"); + g_autofree char *mock = g_strdup_printf("%s/%s", abs_builddir, VIR_TEST_MOCK("qemucapsprobe")); if (!virFileIsExecutable(mock)) { perror(mock); -- 2.44.0
qemu-9.0 was released so update the capability dump to the final version. Notable changes: - the 'vdpa' simulator support was reverted for now Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../caps_9.0.0_x86_64.replies | 50 ++----------------- .../caps_9.0.0_x86_64.xml | 4 +- 2 files changed, 6 insertions(+), 48 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies index 712bb568f0..5d36853ce3 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies @@ -16,11 +16,11 @@ { "return": { "qemu": { - "micro": 91, - "minor": 2, - "major": 8 + "micro": 0, + "minor": 0, + "major": 9 }, - "package": "v9.0.0-rc1-55-g7fcf7575f3" + "package": "v9.0.0" }, "id": "libvirt-2" } @@ -26450,12 +26450,6 @@ "description": "on/off", "type": "bool" }, - { - "default-value": false, - "name": "vdpa", - "description": "on/off", - "type": "bool" - }, { "default-value": true, "name": "migrate-extra", @@ -26879,12 +26873,6 @@ "description": "on/off", "type": "bool" }, - { - "default-value": false, - "name": "vdpa", - "description": "on/off", - "type": "bool" - }, { "default-value": true, "name": "migrate-extra", @@ -27352,12 +27340,6 @@ "description": "on/off", "type": "bool" }, - { - "default-value": false, - "name": "vdpa", - "description": "on/off", - "type": "bool" - }, { "default-value": true, "name": "migrate-extra", @@ -28961,12 +28943,6 @@ "description": "on/off", "type": "bool" }, - { - "default-value": false, - "name": "vdpa", - "description": "on/off", - "type": "bool" - }, { "default-value": true, "name": "migrate-extra", @@ -29611,12 +29587,6 @@ "description": "on/off", "type": "bool" }, - { - "default-value": false, - "name": "vdpa", - "description": "on/off", - "type": "bool" - }, { "default-value": true, "name": "migrate-extra", @@ -30581,12 +30551,6 @@ "description": "on/off", "type": "bool" }, - { - "default-value": false, - "name": "vdpa", - "description": "on/off", - "type": "bool" - }, { "default-value": true, "name": "migrate-extra", @@ -30856,12 +30820,6 @@ "description": "on/off", "type": "bool" }, - { - "default-value": false, - "name": "vdpa", - "description": "on/off", - "type": "bool" - }, { "default-value": true, "name": "migrate-extra", diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index fcfd9cdda9..d386dc927b 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -204,9 +204,9 @@ <flag name='blockjob.backing-mask-protocol'/> <flag name='display-reload'/> <flag name='usb-mtp'/> - <version>8002091</version> + <version>9000000</version> <microcodeVersion>43100245</microcodeVersion> - <package>v9.0.0-rc1-55-g7fcf7575f3</package> + <package>v9.0.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='avx-ne-convert' type='boolean' value='false'/> -- 2.44.0
On Wed, Apr 24, 2024 at 10:27:22AM +0200, Peter Krempa wrote:
Peter Krempa (2): tests: qemucapsprobe: Fix construction of path to libqemucapsprobemock.so qemucapabilitiestest: Update qemu capability dump for qemu-9.0 release
.../caps_9.0.0_x86_64.replies | 50 ++----------------- .../caps_9.0.0_x86_64.xml | 4 +- tests/qemucapsprobe.c | 2 +- 3 files changed, 7 insertions(+), 49 deletions(-)
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
participants (2)
-
Pavel Hrdina -
Peter Krempa