On 3/31/21 8:55 PM, Ján Tomko wrote:
Allow passing a socket of an externally launched virtiofsd
to the vhost-user-fs device.

<filesystem type='mount'>
   <driver type='virtiofs' queue='1024'/>
   <source socket='/tmp/sock/'/>
</filesystem>

https://bugzilla.redhat.com/show_bug.cgi?id=1855789

Signed-off-by: Ján Tomko <jto...@redhat.com>
---
  docs/schemas/domaincommon.rng                 | 11 ++++++
  src/conf/domain_conf.c                        | 21 ++++++----
  src/conf/domain_conf.h                        |  1 +
  src/qemu/qemu_validate.c                      | 17 ++++----
  tests/qemuxml2argvdata/vhost-user-fs-sock.xml | 39 +++++++++++++++++++
  .../vhost-user-fs-sock.x86_64-latest.xml      |  1 +
  tests/qemuxml2xmltest.c                       |  1 +
  7 files changed, 76 insertions(+), 15 deletions(-)
  create mode 100644 tests/qemuxml2argvdata/vhost-user-fs-sock.xml
  create mode 120000 
tests/qemuxml2xmloutdata/vhost-user-fs-sock.x86_64-latest.xml

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index f5ced5b7a2..361cd44e4e 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2747,9 +2747,18 @@
                  <ref name="fsBinary"/>
                </optional>
                <element name="source">
+              <choice>
+              <group>
                  <attribute name="dir">
                    <ref name="absDirPath"/>
                  </attribute>
+              </group>
+              <group>
+              <attribute name="socket">
+            <ref name="absFilePath"/>

Alignment.

+              </attribute>
+              </group>
+              </choice>
                  <empty/>
                </element>
              </interleave>

Michal

Reply via email to