pool/virt-manager
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add 1547e16d-domcapabilities-Get-video-devices.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=487
This commit is contained in:
Charles Arnold 2019-11-12 18:21:52 +00:00 committed by Git OBS Bridge
parent ef6bb90b92
commit 4072874bbf
5 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
1547e16d-domcapabilities-Get-video-devices.patch Normal file
View File

@ -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 <fidencio@redhat.com>
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):

2
2e20b128-domcapabilities-Add-supports_video_bochs.patch
View File

@ -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.orig/virtinst/domcapabilities.py
+++ virt-manager-2.2.1/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) return bool(self.features.sev.supported)

1
virt-manager.changes
View File

@ -2,6 +2,7 @@
Tue Nov 12 10:17:56 MST 2019 - carnold@suse.com Tue Nov 12 10:17:56 MST 2019 - carnold@suse.com
- Upstream bug fixes (bsc#1027942) - Upstream bug fixes (bsc#1027942)
1547e16d-domcapabilities-Get-video-devices.patch
2e20b128-domcapabilities-Add-supports_video_bochs.patch 2e20b128-domcapabilities-Add-supports_video_bochs.patch
------------------------------------------------------------------- -------------------------------------------------------------------

8
virt-manager.spec
View File

@ -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 Patch5: 3009888a-urlfetcher-Dont-override-fullurl-when-its-explicitly-set.patch
Patch6: 9465da41-urlfetcher-Deal-with-file-in-_LocalURLFetcher.patch Patch6: 9465da41-urlfetcher-Deal-with-file-in-_LocalURLFetcher.patch
Patch7: 651e5b6d-devices-video-Simplify-model-hvm-check.patch Patch7: 651e5b6d-devices-video-Simplify-model-hvm-check.patch
Patch8: 2e20b128-domcapabilities-Add-supports_video_bochs.patch Patch8: 1547e16d-domcapabilities-Get-video-devices.patch
Patch9: d9736db9-addhardware-Add-bochs-display-to-the-video-list.patch Patch9: 2e20b128-domcapabilities-Add-supports_video_bochs.patch
Patch10: 8f4c53ea-video-Prefer-bochs-when-its-supported..patch Patch10: d9736db9-addhardware-Add-bochs-display-to-the-video-list.patch
Patch11: 8f4c53ea-video-Prefer-bochs-when-its-supported..patch
# SUSE Only # SUSE Only
Patch70: virtman-desktop.patch Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch Patch71: virtman-kvm.patch
@ -184,6 +185,7 @@ machine).
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
# SUSE Only # SUSE Only
%patch70 -p1 %patch70 -p1
%patch71 -p1 %patch71 -p1

38
virtinst-python2-to-python3-conversion.patch
View File

@ -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.1.orig/virtinst/osdict.py
+++ virt-manager-2.2.0/virtinst/osdict.py +++ virt-manager-2.2.1/virtinst/osdict.py
@@ -54,7 +54,7 @@ def _sort(tosort): @@ -54,7 +54,7 @@ def _sort(tosort):
distro_mappings = {} distro_mappings = {}
retlist = [] retlist = []
@ -11,10 +11,10 @@ Index: virt-manager-2.2.0/virtinst/osdict.py
# Libosinfo has some duplicate version numbers here, so append .1 # Libosinfo has some duplicate version numbers here, so append .1
# if there's a collision # if there's a collision
sortby = _sortby(osinfo) 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.1.orig/virtinst/install/installertreemedia.py
+++ virt-manager-2.2.0/virtinst/install/installertreemedia.py +++ virt-manager-2.2.1/virtinst/install/installertreemedia.py
@@ -20,7 +20,7 @@ from ..osdict import OSDB @@ -20,7 +20,7 @@ from ..osdict import OSDB
(MEDIA_DIR, (MEDIA_DIR,
MEDIA_ISO, MEDIA_ISO,
@ -24,10 +24,10 @@ Index: virt-manager-2.2.0/virtinst/install/installertreemedia.py
def _is_url(url): 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.1.orig/virtinst/xmlbuilder.py
+++ virt-manager-2.2.0/virtinst/xmlbuilder.py +++ virt-manager-2.2.1/virtinst/xmlbuilder.py
@@ -661,7 +661,7 @@ class XMLBuilder(object): @@ -661,7 +661,7 @@ class XMLBuilder(object):
whenever child objects are added or removed 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)): for obj in xmlutil.listify(getattr(self, propname)):
idxstr = "" idxstr = ""
if not xmlprop.is_single: 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.1.orig/virtinst/domcapabilities.py
+++ virt-manager-2.2.0/virtinst/domcapabilities.py +++ virt-manager-2.2.1/virtinst/domcapabilities.py
@@ -217,7 +217,7 @@ class DomainCapabilities(XMLBuilder): @@ -218,7 +218,7 @@ class DomainCapabilities(XMLBuilder):
return _("BIOS") return _("BIOS")
return _("None") return _("None")
@ -50,10 +50,10 @@ Index: virt-manager-2.2.0/virtinst/domcapabilities.py
for pattern in patterns: for pattern in patterns:
if re.match(pattern, path): if re.match(pattern, path):
return (_("UEFI %(arch)s: %(path)s") % 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.1.orig/virtinst/devices/disk.py
+++ virt-manager-2.2.0/virtinst/devices/disk.py +++ virt-manager-2.2.1/virtinst/devices/disk.py
@@ -269,7 +269,7 @@ class DeviceDisk(Device): @@ -269,7 +269,7 @@ class DeviceDisk(Device):
digit = 1 digit = 1
@ -77,10 +77,10 @@ Index: virt-manager-2.2.0/virtinst/devices/disk.py
for i in ran: for i in ran:
postfix = self.num_to_target(i + 1) 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.1.orig/virtinst/pollhelpers.py
+++ virt-manager-2.2.0/virtinst/pollhelpers.py +++ virt-manager-2.2.1/virtinst/pollhelpers.py
@@ -129,7 +129,7 @@ def fetch_pools(backend, origmap, build_ @@ -129,7 +129,7 @@ def fetch_pools(backend, origmap, build_
for obj in objs: for obj in objs:
try: try: