68b092e4b8
11a887ec-cli-disk-Add-driver.metadata_cache-options.patch 7295ebfb-tests-cli-Fix-test-output-after-previous-commit.patch 58f5e36d-fsdetails-Fix-an-error-with-source.socket-of-virtiofs.patch c22a876e-tests-Add-a-compat-check-for-linux2020-in-amd-sev-test-case.patch fbdf0516-cli-cpu-Add-maxphysaddr.mode-bits-options.patch b0d05167-cloner-Sync-uuid-and-sysinfo-system-uuid.patch 999ccb85-virt-install-unattended-and-cloud-init-conflict.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=579
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
Subject: fsdetails: Fix an error with source.socket of virtiofs
|
|
From: Lin Ma lma@suse.com Tue Aug 16 12:59:36 2022 +0800
|
|
Date: Wed Aug 17 10:24:10 2022 -0400:
|
|
Git: 58f5e36da76277bfc7fb4d87293be60ef6e0cbc1
|
|
|
|
Using the source.socket of virtiofs needs a virtiofsd daemon launched
|
|
outside of libvirtd, So the filesystem UI doesn't support it yet. If
|
|
users need it they can set it manually in the XML editor.
|
|
But if we view the filesystem info of such a VM on the details page,
|
|
It fails with this error message:
|
|
|
|
Traceback (most recent call last):
|
|
File "/usr/share/virt-manager/virtManager/details/details.py", line 1713, in _refresh_page
|
|
self._refresh_filesystem_page(dev)
|
|
File "/usr/share/virt-manager/virtManager/details/details.py", line 2241, in _refresh_filesystem_page
|
|
self.fsDetails.set_dev(dev)
|
|
File "/usr/share/virt-manager/virtManager/device/fsdetails.py", line 193, in set_dev
|
|
self.widget("fs-source").set_text(dev.source)
|
|
TypeError: Argument 1 does not allow None as a value
|
|
|
|
This patch fixes above issue by leaving the 'source path' info blank in
|
|
case of source.socket.
|
|
In this case, Considering that showing 'target path' info without source
|
|
info is kind of meaningless, So this patch leaves the 'target path' info
|
|
blank as well.
|
|
|
|
Signed-off-by: Lin Ma <lma@suse.com>
|
|
|
|
diff --git a/virtManager/device/fsdetails.py b/virtManager/device/fsdetails.py
|
|
index 40868d1c..b9956e1d 100644
|
|
--- a/virtManager/device/fsdetails.py
|
|
+++ b/virtManager/device/fsdetails.py
|
|
@@ -190,7 +190,7 @@ class vmmFSDetails(vmmGObjectUI):
|
|
self.widget("fs-format-combo"), dev.driver_format)
|
|
|
|
if dev.type != DeviceFilesystem.TYPE_RAM:
|
|
- self.widget("fs-source").set_text(dev.source)
|
|
+ self.widget("fs-source").set_text(dev.source or "")
|
|
else:
|
|
self.widget("fs-ram-source-spin").set_value(int(dev.source) // 1024)
|
|
self.widget("fs-target").set_text(dev.target or "")
|