37fd552490
- Synchronize with libvirt-10.5.0-4.el9 (RHEL-30177) - virt-host-validate: Allow longer list of CPU flags - vmx: Be even more lax when trying to comprehend serial ports - vmx: Do not require all ID data for VMWare Distributed Switch - tests: vhostuser: add virtiofsd json descriptor - tests: qemuxmlconf: adjust test case to new virtiofsd - qemu: fill capabilities for virtiofsd - qemu: do not use deprecated options for new virtiofsd - qemu: migration: allow migration for virtiofs - virt-host-validate: Drop extra "PASS" - qemu: Don't leave beingDestroyed=true on inactive domain Related: RHEL-30177
70 lines
2.6 KiB
Diff
70 lines
2.6 KiB
Diff
From d0bdafd019e0071149e5bc294389386c789a66bd Mon Sep 17 00:00:00 2001
|
|
Message-ID: <d0bdafd019e0071149e5bc294389386c789a66bd.1720800605.git.jdenemar@redhat.com>
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
Date: Thu, 4 Jul 2024 15:54:26 +0200
|
|
Subject: [PATCH] tests: vhostuser: add virtiofsd json descriptor
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Add the capabilities from the latest virtiofsd main branch and adjust
|
|
the order in the priority test accordingly.
|
|
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
(cherry picked from commit f64e658df04e9cf5b99fbe5c846ba3478e13d826)
|
|
|
|
https://issues.redhat.com/browse/RHEL-7108
|
|
https://issues.redhat.com/browse/RHEL-40135
|
|
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
.../usr/libexec/qemu/vhost-user/test-virtiofsd | 10 ++++++++++
|
|
.../usr/share/qemu/vhost-user/50-qemu-virtiofsd.json | 5 +++++
|
|
tests/qemuvhostusertest.c | 1 +
|
|
3 files changed, 16 insertions(+)
|
|
create mode 100755 tests/qemuvhostuserdata/usr/libexec/qemu/vhost-user/test-virtiofsd
|
|
create mode 100644 tests/qemuvhostuserdata/usr/share/qemu/vhost-user/50-qemu-virtiofsd.json
|
|
|
|
diff --git a/tests/qemuvhostuserdata/usr/libexec/qemu/vhost-user/test-virtiofsd b/tests/qemuvhostuserdata/usr/libexec/qemu/vhost-user/test-virtiofsd
|
|
new file mode 100755
|
|
index 0000000000..90b38187c9
|
|
--- /dev/null
|
|
+++ b/tests/qemuvhostuserdata/usr/libexec/qemu/vhost-user/test-virtiofsd
|
|
@@ -0,0 +1,10 @@
|
|
+#!/bin/sh
|
|
+
|
|
+cat <<EOF
|
|
+{
|
|
+ "type": "fs",
|
|
+ "features": [
|
|
+ "migrate-precopy"
|
|
+ ]
|
|
+}
|
|
+EOF
|
|
diff --git a/tests/qemuvhostuserdata/usr/share/qemu/vhost-user/50-qemu-virtiofsd.json b/tests/qemuvhostuserdata/usr/share/qemu/vhost-user/50-qemu-virtiofsd.json
|
|
new file mode 100644
|
|
index 0000000000..b908bc6b30
|
|
--- /dev/null
|
|
+++ b/tests/qemuvhostuserdata/usr/share/qemu/vhost-user/50-qemu-virtiofsd.json
|
|
@@ -0,0 +1,5 @@
|
|
+{
|
|
+ "description": "virtiofsd vhost-user-fs",
|
|
+ "type": "fs",
|
|
+ "binary": "/usr/libexec/qemu/vhost-user/test-vhost-user-gpu"
|
|
+}
|
|
diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c
|
|
index 4bbad94f74..1f8553fc2d 100644
|
|
--- a/tests/qemuvhostusertest.c
|
|
+++ b/tests/qemuvhostusertest.c
|
|
@@ -60,6 +60,7 @@ testVUPrecedence(const void *opaque G_GNUC_UNUSED)
|
|
const char *expected[] = {
|
|
PREFIX "/share/qemu/vhost-user/30-gpu.json",
|
|
SYSCONFDIR "/qemu/vhost-user/40-gpu.json",
|
|
+ PREFIX "/share/qemu/vhost-user/50-qemu-virtiofsd.json",
|
|
PREFIX "/share/qemu/vhost-user/60-gpu.json",
|
|
NULL
|
|
};
|
|
--
|
|
2.45.2
|