diff --git a/1547e16d-domcapabilities-Get-video-devices.patch b/1547e16d-domcapabilities-Get-video-devices.patch new file mode 100644 index 00000000..db14c807 --- /dev/null +++ b/1547e16d-domcapabilities-Get-video-devices.patch @@ -0,0 +1,22 @@ +Subject: domcapabilities: Get video devices +From: Fabiano Fidêncio fidencio@redhat.com Thu Oct 3 10:44:52 2019 +0200 +Date: Fri Oct 4 11:15:09 2019 -0400: +Git: 1547e16d62736c861a0e4dadeb86ef372d2698bd + +domcapabilities already handles disk and hostdev. Let's add support for +getting video devices as well. + +Signed-off-by: Fabiano Fidêncio + +diff --git a/virtinst/domcapabilities.py b/virtinst/domcapabilities.py +index f11f18aa..9cc27bc2 100644 +--- a/virtinst/domcapabilities.py ++++ b/virtinst/domcapabilities.py +@@ -95,6 +95,7 @@ class _Devices(_CapsBlock): + XML_NAME = "devices" + hostdev = XMLChildProperty(_make_capsblock("hostdev"), is_single=True) + disk = XMLChildProperty(_make_capsblock("disk"), is_single=True) ++ video = XMLChildProperty(_make_capsblock("video"), is_single=True) + + + class _Features(_CapsBlock): diff --git a/2e20b128-domcapabilities-Add-supports_video_bochs.patch b/2e20b128-domcapabilities-Add-supports_video_bochs.patch index acb74c5a..750718ad 100644 --- a/2e20b128-domcapabilities-Add-supports_video_bochs.patch +++ b/2e20b128-domcapabilities-Add-supports_video_bochs.patch @@ -12,7 +12,7 @@ Index: virt-manager-2.2.1/virtinst/domcapabilities.py =================================================================== --- virt-manager-2.2.1.orig/virtinst/domcapabilities.py +++ virt-manager-2.2.1/virtinst/domcapabilities.py -@@ -324,6 +324,14 @@ class DomainCapabilities(XMLBuilder): +@@ -325,6 +325,14 @@ class DomainCapabilities(XMLBuilder): """ return bool(self.features.sev.supported) diff --git a/virt-manager.changes b/virt-manager.changes index b90e0a3b..043f42bc 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -2,6 +2,7 @@ Tue Nov 12 10:17:56 MST 2019 - carnold@suse.com - Upstream bug fixes (bsc#1027942) + 1547e16d-domcapabilities-Get-video-devices.patch 2e20b128-domcapabilities-Add-supports_video_bochs.patch ------------------------------------------------------------------- diff --git a/virt-manager.spec b/virt-manager.spec index 9f93bce6..c9bfecb1 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -39,9 +39,10 @@ Patch4: 53245827-urlfetcher-Force-a-flush-after-writing-to-a-file.patch Patch5: 3009888a-urlfetcher-Dont-override-fullurl-when-its-explicitly-set.patch Patch6: 9465da41-urlfetcher-Deal-with-file-in-_LocalURLFetcher.patch Patch7: 651e5b6d-devices-video-Simplify-model-hvm-check.patch -Patch8: 2e20b128-domcapabilities-Add-supports_video_bochs.patch -Patch9: d9736db9-addhardware-Add-bochs-display-to-the-video-list.patch -Patch10: 8f4c53ea-video-Prefer-bochs-when-its-supported..patch +Patch8: 1547e16d-domcapabilities-Get-video-devices.patch +Patch9: 2e20b128-domcapabilities-Add-supports_video_bochs.patch +Patch10: d9736db9-addhardware-Add-bochs-display-to-the-video-list.patch +Patch11: 8f4c53ea-video-Prefer-bochs-when-its-supported..patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -184,6 +185,7 @@ machine). %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 # SUSE Only %patch70 -p1 %patch71 -p1 diff --git a/virtinst-python2-to-python3-conversion.patch b/virtinst-python2-to-python3-conversion.patch index c5bc7581..9e24f227 100644 --- a/virtinst-python2-to-python3-conversion.patch +++ b/virtinst-python2-to-python3-conversion.patch @@ -1,7 +1,7 @@ -Index: virt-manager-2.2.0/virtinst/osdict.py +Index: virt-manager-2.2.1/virtinst/osdict.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/osdict.py -+++ virt-manager-2.2.0/virtinst/osdict.py +--- virt-manager-2.2.1.orig/virtinst/osdict.py ++++ virt-manager-2.2.1/virtinst/osdict.py @@ -54,7 +54,7 @@ def _sort(tosort): distro_mappings = {} retlist = [] @@ -11,10 +11,10 @@ Index: virt-manager-2.2.0/virtinst/osdict.py # Libosinfo has some duplicate version numbers here, so append .1 # if there's a collision sortby = _sortby(osinfo) -Index: virt-manager-2.2.0/virtinst/install/installertreemedia.py +Index: virt-manager-2.2.1/virtinst/install/installertreemedia.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/install/installertreemedia.py -+++ virt-manager-2.2.0/virtinst/install/installertreemedia.py +--- virt-manager-2.2.1.orig/virtinst/install/installertreemedia.py ++++ virt-manager-2.2.1/virtinst/install/installertreemedia.py @@ -20,7 +20,7 @@ from ..osdict import OSDB (MEDIA_DIR, MEDIA_ISO, @@ -24,10 +24,10 @@ Index: virt-manager-2.2.0/virtinst/install/installertreemedia.py def _is_url(url): -Index: virt-manager-2.2.0/virtinst/xmlbuilder.py +Index: virt-manager-2.2.1/virtinst/xmlbuilder.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/xmlbuilder.py -+++ virt-manager-2.2.0/virtinst/xmlbuilder.py +--- virt-manager-2.2.1.orig/virtinst/xmlbuilder.py ++++ virt-manager-2.2.1/virtinst/xmlbuilder.py @@ -661,7 +661,7 @@ class XMLBuilder(object): whenever child objects are added or removed """ @@ -37,11 +37,11 @@ Index: virt-manager-2.2.0/virtinst/xmlbuilder.py for obj in xmlutil.listify(getattr(self, propname)): idxstr = "" if not xmlprop.is_single: -Index: virt-manager-2.2.0/virtinst/domcapabilities.py +Index: virt-manager-2.2.1/virtinst/domcapabilities.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/domcapabilities.py -+++ virt-manager-2.2.0/virtinst/domcapabilities.py -@@ -217,7 +217,7 @@ class DomainCapabilities(XMLBuilder): +--- virt-manager-2.2.1.orig/virtinst/domcapabilities.py ++++ virt-manager-2.2.1/virtinst/domcapabilities.py +@@ -218,7 +218,7 @@ class DomainCapabilities(XMLBuilder): return _("BIOS") return _("None") @@ -50,10 +50,10 @@ Index: virt-manager-2.2.0/virtinst/domcapabilities.py for pattern in patterns: if re.match(pattern, path): return (_("UEFI %(arch)s: %(path)s") % -Index: virt-manager-2.2.0/virtinst/devices/disk.py +Index: virt-manager-2.2.1/virtinst/devices/disk.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/devices/disk.py -+++ virt-manager-2.2.0/virtinst/devices/disk.py +--- virt-manager-2.2.1.orig/virtinst/devices/disk.py ++++ virt-manager-2.2.1/virtinst/devices/disk.py @@ -269,7 +269,7 @@ class DeviceDisk(Device): digit = 1 @@ -77,10 +77,10 @@ Index: virt-manager-2.2.0/virtinst/devices/disk.py for i in ran: postfix = self.num_to_target(i + 1) -Index: virt-manager-2.2.0/virtinst/pollhelpers.py +Index: virt-manager-2.2.1/virtinst/pollhelpers.py =================================================================== ---- virt-manager-2.2.0.orig/virtinst/pollhelpers.py -+++ virt-manager-2.2.0/virtinst/pollhelpers.py +--- virt-manager-2.2.1.orig/virtinst/pollhelpers.py ++++ virt-manager-2.2.1/virtinst/pollhelpers.py @@ -129,7 +129,7 @@ def fetch_pools(backend, origmap, build_ for obj in objs: try: