From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 4 Jul 2024 13:54:26 +0000 (+0200)
Subject: tests: vhostuser: add virtiofsd json descriptor
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f64e658df04e9cf5b99fbe5c846ba3478e13d826;p=libvirt.git

tests: vhostuser: add virtiofsd json descriptor

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>
---

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
     };