diff options
| author | Lin Ma <lma@suse.com> | 2022-11-10 15:57:24 +0800 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2022-12-14 12:44:54 -0500 |
| commit | 180154d752a33f6b26643184e6aa19dcb110e0eb (patch) | |
| tree | e77af263c3c3c9aa69776b055edeb1ab6226daca | |
| parent | 8cc6ee8da36d518ec928c072822bbee6ebe2e362 (diff) | |
| download | virt-manager-180154d752a33f6b26643184e6aa19dcb110e0eb.tar.gz | |
guest: Query availability of spicevmc channels in domcaps
Signed-off-by: Lin Ma <lma@suse.com>
| -rw-r--r-- | virtinst/domcapabilities.py | 13 | ||||
| -rw-r--r-- | virtinst/guest.py | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/virtinst/domcapabilities.py b/virtinst/domcapabilities.py index 91f51f9f..db08bf65 100644 --- a/virtinst/domcapabilities.py +++ b/virtinst/domcapabilities.py @@ -114,6 +114,7 @@ class _Devices(_CapsBlock): tpm = XMLChildProperty(_make_capsblock("tpm"), is_single=True) filesystem = XMLChildProperty(_make_capsblock("filesystem"), is_single=True) redirdev = XMLChildProperty(_make_capsblock("redirdev"), is_single=True) + channel = XMLChildProperty(_make_capsblock("channel"), is_single=True) class _Features(_CapsBlock): @@ -449,6 +450,18 @@ class DomainCapabilities(XMLBuilder): return self.devices.graphics.get_enum("type").has_value("spice") + def supports_channel_spicevmc(self): + """ + Return False if libvirt explicitly advertises no support for + spice channel + """ + if self.devices.channel.supported is None: + # Follow the original behavior in case of talking to older + # libvirt. + return True + + return self.devices.channel.get_enum("type").has_value("spicevmc") + def supports_redirdev_usb(self): """ Return False if libvirt explicitly advertises no support for diff --git a/virtinst/guest.py b/virtinst/guest.py index 1d1e2ee9..c2244ae3 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -1127,6 +1127,8 @@ class Guest(XMLBuilder): self.add_device(ctrl) def _add_spice_channels(self): + if not self.lookup_domcaps().supports_channel_spicevmc(): + return if self.skip_default_channel: return for chn in self.devices.channel: |