shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-18 06:03:58 +03:00
Code Issues Projects Releases Wiki Activity

Fix filesystem socket.source

Browse Source 
When specifying the socket.source option for filesystem devices, like
this:
  --filesystem type=mount,driver.type=virtiofs,source.socket=/xyz.sock,target.dir=tag1

virt-install is writing the xml as:

    <filesystem type="mount">
      <source>
        <socket>/xyz.sock</socket>
      </source>
      <target dir="tag1"/>
      <driver type="virtiofs"/>
    </filesystem>

This produces an error such as:

  ERROR missing source information for device mount_tag1

But the socket should be an attribute of source rather than a child
element. After this patch, the same command results in the following XML
and no error is produced:

    <filesystem type="mount">
      <source socket="/xyz.sock"/>
      <target dir="tag1"/>
      <driver type="virtiofs"/>
    </filesystem>

Resolves: RHEL-1126

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Jonathon Jongsma 2023-10-23 14:42:19 -05:00 committed by Pino Toscano
parent 0fb7377abb
commit 40b73fec1b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/data/cli/compare/virt-install-many-devices.xml
View File

@ -509,9 +509,7 @@
<readonly/> <readonly/>
<space_hard_limit>1234</space_hard_limit> <space_hard_limit>1234</space_hard_limit>
<space_soft_limit>500</space_soft_limit> <space_soft_limit>500</space_soft_limit>
<source pool="pool1" volume="vol"> <source pool="pool1" volume="vol" socket="/tmp/foo.sock"/>
<socket>/tmp/foo.sock</socket>
</source>
<target dir="/foo"/> <target dir="/foo"/>
<binary path="/foo/virtiofsd" xattr="off"> <binary path="/foo/virtiofsd" xattr="off">
<cache mode="always"/> <cache mode="always"/>

2
virtinst/devices/filesystem.py
View File

@ -53,7 +53,7 @@ class DeviceFilesystem(Device):
source_units = XMLProperty("./source/@units") source_units = XMLProperty("./source/@units")
source_pool = XMLProperty("./source/@pool") source_pool = XMLProperty("./source/@pool")
source_volume = XMLProperty("./source/@volume") source_volume = XMLProperty("./source/@volume")
source_socket = XMLProperty("./source/socket") source_socket = XMLProperty("./source/@socket")
binary_path = XMLProperty("./binary/@path") binary_path = XMLProperty("./binary/@path")
binary_xattr = XMLProperty("./binary/@xattr", is_onoff=True) binary_xattr = XMLProperty("./binary/@xattr", is_onoff=True)