virt-manager-3.2.0-13.el9

- cli: --filesystem: add binary.sandbox.mode and source.socket (rhbz#2045932)
- nodedev: Improve error with unknown address strings (rhbz#2017840)

Resolves: rhbz#2017840, rhbz#2045932

virt-manager-cli-filesystem-add-binary.sandbox.mode-and-source.socket.patch

@@ -0,0 +1,93 @@
+From 5c16353a007fd7f18eb44a7413d0c146b7de1a4c Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Fri, 30 Jul 2021 13:15:29 -0400
+Subject: [PATCH] cli: --filesystem: add binary.sandbox.mode and source.socket
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+(cherry picked from commit 520b3a3b35359ddd07f3a818d6cc3e6740079eff)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2045932
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+---
+ tests/data/cli/compare/virt-install-many-devices.xml | 5 ++++-
+ tests/test_cli.py                                    | 2 +-
+ virtinst/cli.py                                      | 2 ++
+ virtinst/devices/filesystem.py                       | 2 ++
+ 4 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml
+index 3bd756b3..417d8db0 100644
+--- a/tests/data/cli/compare/virt-install-many-devices.xml
++++ b/tests/data/cli/compare/virt-install-many-devices.xml
+@@ -293,11 +293,14 @@
+       <readonly/>
+       <space_hard_limit>1234</space_hard_limit>
+       <space_soft_limit>500</space_soft_limit>
+-      <source pool="pool1" volume="vol"/>
++      <source pool="pool1" volume="vol">
++        <socket>/tmp/foo.sock</socket>
++      </source>
+       <target dir="/foo"/>
+       <binary path="/foo/virtiofsd" xattr="off">
+         <cache mode="always"/>
+         <lock posix="off" flock="on"/>
++        <sandbox mode="chroot"/>
+       </binary>
+       <driver name="virtiofs" queue="3"/>
+     </filesystem>
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 2034d21c..862d19dd 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -686,7 +686,7 @@ source.reservations.managed=no,source.reservations.source.type=unix,source.reser
+ --filesystem type-mount,source.dir=/,target=/
+ --filesystem type=template,source.name=foo,target=/
+ --filesystem type=file,source.file=foo.img,target=/
+---filesystem type=volume,model=virtio,multidevs=remap,readonly=on,space_hard_limit=1234,space_soft_limit=500,source.pool=pool1,source.volume=vol,driver.name=virtiofs,driver.queue=3,binary.path=/foo/virtiofsd,binary.xattr=off,binary.cache.mode=always,binary.lock.posix=off,binary.lock.flock=on,target.dir=/foo
++--filesystem type=volume,model=virtio,multidevs=remap,readonly=on,space_hard_limit=1234,space_soft_limit=500,source.pool=pool1,source.volume=vol,driver.name=virtiofs,driver.queue=3,binary.path=/foo/virtiofsd,binary.xattr=off,binary.cache.mode=always,binary.lock.posix=off,binary.lock.flock=on,target.dir=/foo,binary.sandbox.mode=chroot,source.socket=/tmp/foo.sock
+ --filesystem type=block,source.dev=/dev/foo,target.dir=/
+ --filesystem type=ram,source.usage=1024,source.units=MiB,target=/
+ 
+diff --git a/virtinst/cli.py b/virtinst/cli.py
+index dbd4a545..13782fc8 100644
+--- a/virtinst/cli.py
++++ b/virtinst/cli.py
+@@ -4225,6 +4225,7 @@ class ParserFilesystem(VirtCLIParser):
+         cls.add_arg("source.volume", "source_volume")
+         cls.add_arg("source.units", "source_units")
+         cls.add_arg("source.usage", "source_usage")
++        cls.add_arg("source.socket", "source_socket")
+ 
+         cls.add_arg("target.dir", "target_dir")
+ 
+@@ -4233,6 +4234,7 @@ class ParserFilesystem(VirtCLIParser):
+         cls.add_arg("binary.cache.mode", "binary_cache_mode")
+         cls.add_arg("binary.lock.posix", "binary_lock_posix", is_onoff=True)
+         cls.add_arg("binary.lock.flock", "binary_lock_flock", is_onoff=True)
++        cls.add_arg("binary.sandbox.mode", "binary_sandbox_mode")
+ 
+         cls.add_arg("driver.format", "driver_format")
+         cls.add_arg("driver.name", "driver_name")
+diff --git a/virtinst/devices/filesystem.py b/virtinst/devices/filesystem.py
+index 574844b6..02402bac 100644
+--- a/virtinst/devices/filesystem.py
++++ b/virtinst/devices/filesystem.py
+@@ -49,12 +49,14 @@ class DeviceFilesystem(Device):
+     source_units = XMLProperty("./source/@units")
+     source_pool = XMLProperty("./source/@pool")
+     source_volume = XMLProperty("./source/@volume")
++    source_socket = XMLProperty("./source/socket")
+ 
+     binary_path = XMLProperty("./binary/@path")
+     binary_xattr = XMLProperty("./binary/@xattr", is_onoff=True)
+     binary_cache_mode = XMLProperty("./binary/cache/@mode")
+     binary_lock_posix = XMLProperty("./binary/lock/@posix", is_onoff=True)
+     binary_lock_flock = XMLProperty("./binary/lock/@flock", is_onoff=True)
++    binary_sandbox_mode = XMLProperty("./binary/sandbox/@mode")
+ 
+     def _type_to_source_prop(self):
+         if self.type == DeviceFilesystem.TYPE_TEMPLATE:
+-- 
+2.34.1
+

virt-manager-nodedev-Improve-error-with-unknown-address-strings.patch

@@ -0,0 +1,32 @@
+From 6cdb34eb04e17315cfc7ee7cf6538bc6370c8d8b Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Tue, 11 Jan 2022 11:39:29 -0500
+Subject: [PATCH] nodedev: Improve error with unknown address strings
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+(cherry picked from commit ed7b8769c4d48c89ed593138171bc8dbb1ead108)
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2017840
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+---
+ virtinst/nodedev.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/virtinst/nodedev.py b/virtinst/nodedev.py
+index 248723b9..f0bc769b 100644
+--- a/virtinst/nodedev.py
++++ b/virtinst/nodedev.py
+@@ -235,7 +235,8 @@ def _AddressStringToHostdev(conn, addrstr):
+             hostdev.bus = bus
+             hostdev.device = device
+         else:
+-            raise RuntimeError("Unknown address type")
++            raise RuntimeError(
++                    "Unknown hostdev address string format '%s'" % addrstr)
+     except Exception:
+         log.debug("Error parsing node device string.", exc_info=True)
+         raise
+-- 
+2.34.1
+

virt-manager.spec

@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 3.2.0
-Release: 12%{?dist}%{?extra_release}
+Release: 13%{?dist}%{?extra_release}
 %global verrel %{version}-%{release}
 
 Summary: Desktop tool for managing virtual machines via libvirt
@@ -32,6 +32,8 @@ Patch11: virt-manager-virt-manager-enable-MDEV-support.patch
 Patch12: virt-manager-cli-introduce-resource-fibrechannel.appid-option.patch
 Patch13: virt-manager-Handle-new-nodedev-name-for-mediated-devices.patch
 Patch14: virt-manager-cli-add-ioapic.driver-to-features.patch
+Patch15: virt-manager-cli-filesystem-add-binary.sandbox.mode-and-source.socket.patch
+Patch16: virt-manager-nodedev-Improve-error-with-unknown-address-strings.patch
 
 
 Requires: virt-manager-common = %{verrel}
@@ -189,6 +191,10 @@ done
 
 
 %changelog
+* Mon Feb  7 2022 Jonathon Jongsma <jjongsma@redhat.com> - 3.2.0-13
+- cli: --filesystem: add binary.sandbox.mode and source.socket (rhbz#2045932)
+- nodedev: Improve error with unknown address strings (rhbz#2017840)
+
 * Thu Jan 20 2022 Jonathon Jongsma <jjongsma@redhat.com> - 3.2.0-12
 - cli: add 'ioapic.driver' to --features (rhbz#2039127)