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

- bsc#978937 - New qemu virtual virtio gpu not selectable in

Browse Source 
virt-manager
  8ba48f52-add-virtio-device-model-and-accel3d-attribute.patch

- bsc#964407 - Virt-Manager: Installer wrongly detects SLE-12-GA
  media as SLE-12-SP1
  virtinst-fix-sle12sp1-detection.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=309
This commit is contained in:
Charles Arnold 2016-05-09 15:46:59 +00:00 committed by Git OBS Bridge
parent 006d6394ea
commit 7ae2f1099b
5 changed files with 116 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
8ba48f52-add-virtio-device-model-and-accel3d-attribute.patch Normal file
View File

@ -0,0 +1,68 @@
Subject: virtinst: add virtio device model and accel3d attribute
From: Marc-André Lureau marcandre.lureau@gmail.com Fri Mar 4 12:31:52 2016 +0100
Date: Wed Mar 9 20:25:37 2016 -0500:
Git: 8ba48f5299409354fb610cd8620987e635c90643
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Index: virt-manager-1.3.2/man/virt-install.pod
===================================================================
--- virt-manager-1.3.2.orig/man/virt-install.pod
+++ virt-manager-1.3.2/man/virt-install.pod
@@ -1334,7 +1334,7 @@ Use --console=? to see a list of all ava
Specify what video device model will be attached to the guest. Valid values
for VIDEO are hypervisor specific, but some options for recent kvm are
-cirrus, vga, qxl, or vmvga (vmware).
+cirrus, vga, qxl, virtio, or vmvga (vmware).
Use --video=? to see a list of all available sub options. Complete details at L<http://libvirt.org/formatdomain.html#elementsVideo>
Index: virt-manager-1.3.2/tests/xmlparse-xml/change-videos-out.xml
===================================================================
--- virt-manager-1.3.2.orig/tests/xmlparse-xml/change-videos-out.xml
+++ virt-manager-1.3.2/tests/xmlparse-xml/change-videos-out.xml
@@ -30,7 +30,9 @@
<model type="vmvga" heads="5"/>
</video>
<video>
- <model type="qxl" vgamem="8192" ram="100"/>
+ <model type="qxl" vgamem="8192" ram="100">
+ <acceleration accel3d="yes"/>
+ </model>
</video>
</devices>
</domain>
Index: virt-manager-1.3.2/tests/xmlparse.py
===================================================================
--- virt-manager-1.3.2.orig/tests/xmlparse.py
+++ virt-manager-1.3.2/tests/xmlparse.py
@@ -673,6 +673,7 @@ class XMLParseTest(unittest.TestCase):
check("model", "cirrus", "cirrus", "qxl")
check("ram", None, 100)
check("vgamem", None, 8192)
+ check("accel3d", None, True)
self._alter_compare(guest.get_xml_config(), outfile)
Index: virt-manager-1.3.2/virtinst/devicevideo.py
===================================================================
--- virt-manager-1.3.2.orig/virtinst/devicevideo.py
+++ virt-manager-1.3.2/virtinst/devicevideo.py
@@ -27,7 +27,7 @@ class VirtualVideoDevice(VirtualDevice):
# Default models list
MODEL_DEFAULT = "default"
- MODELS = ["cirrus", "vga", "vmvga", "xen", "qxl"]
+ MODELS = ["cirrus", "vga", "vmvga", "xen", "qxl", "virtio"]
@staticmethod
def pretty_model(model):
@@ -43,6 +43,7 @@ class VirtualVideoDevice(VirtualDevice):
ram = XMLProperty("./model/@ram", is_int=True)
heads = XMLProperty("./model/@heads", is_int=True)
vgamem = XMLProperty("./model/@vgamem", is_int=True)
+ accel3d = XMLProperty("./model/acceleration/@accel3d", is_yesno=True)
VirtualVideoDevice.register_type()

14
virt-manager.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri May 6 15:50:12 MDT 2016 - carnold@suse.com
- bsc#978937 - New qemu virtual virtio gpu not selectable in
virt-manager
8ba48f52-add-virtio-device-model-and-accel3d-attribute.patch
-------------------------------------------------------------------
Mon Apr 25 15:20:23 MDT 2016 - michael@stroeder.com
@ -12,6 +19,13 @@ Tue Apr 5 12:46:28 UTC 2016 - dimstar@opensuse.org
yast-vm-management, explicitly set by virtman-desktop.patch, is
shipped in this package.
-------------------------------------------------------------------
Wed Mar 30 13:46:18 MDT 2016 - carnold@suse.com
- bsc#964407 - Virt-Manager: Installer wrongly detects SLE-12-GA
media as SLE-12-SP1
virtinst-fix-sle12sp1-detection.patch
-------------------------------------------------------------------
Wed Mar 23 13:02:36 MDT 2016 - carnold@suse.com

2
virt-manager.spec
View File

@ -42,6 +42,7 @@ Patch2: 21fd079e-replace-unar-with-other-archivers.patch
Patch3: eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
Patch4: 1c221fd0-suse-ovmf-paths.patch
Patch5: f11eb00b-virt-convert-decompress-gz-files-before-converting.patch
Patch6: 8ba48f52-add-virtio-device-model-and-accel3d-attribute.patch
# SUSE Only
Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch
@ -165,6 +166,7 @@ machine).
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
# SUSE Only
%patch70 -p1
%patch71 -p1

35
virtinst-fix-sle12sp1-detection.patch
View File

@ -2,15 +2,40 @@ Index: virt-manager-1.3.2/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.3.2/virtinst/urlfetcher.py
@@ -441,7 +441,10 @@ def _distroFromSUSEContent(fetcher, arch
@@ -402,6 +402,10 @@ def _distroFromSUSEContent(fetcher, arch
distro_distro = line.rsplit(',', 1)
elif line.startswith("VERSION "):
distro_version = line.split(' ', 1)
+ if len(distro_version) > 1:
+ d_version = distro_version[1].split('-', 1)
+ if len(d_version) > 1:
+ distro_version[1] = d_version[0]
elif line.startswith("SUMMARY "):
distro_summary = line.split(' ', 1)
elif line.startswith("BASEARCHS "):
@@ -435,17 +439,23 @@ def _distroFromSUSEContent(fetcher, arch
elif cbuf.find("ppc64le") != -1:
arch = "ppc64le"
+ def parse_sle_distribution(d):
+ sle_version = d[1].strip().rsplit(' ')[4]
+ if len(d[1].strip().rsplit(' ')) > 5:
+ sle_version = sle_version + '.' + d[1].strip().rsplit(' ')[5][2]
+ return ['VERSION', sle_version]
+
dclass = GenericDistro
if distribution:
if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \
re.match(".*SUSE SLES*", distribution[1]):
dclass = SLESDistro
if distro_version is None:
- distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
+ sles_version = distribution[1].strip().rsplit(' ')[4]
+ if len(distribution[1].strip().rsplit(' ')) > 5:
+ sles_version = sles_version + '.' + distribution[1].strip().rsplit(' ')[5][2]
+ distro_version = ['VERSION', sles_version]
+ distro_version = parse_sle_distribution(distribution)
elif re.match(".*SUSE Linux Enterprise Desktop*", distribution[1]):
dclass = SLEDDistro
if distro_version is None:
- distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
+ distro_version = parse_sle_distribution(distribution)
elif re.match(".*Open Enterprise Server*", distribution[1]):
dclass = SLESDistro
if distro_version is None:

4
virtinst-fix-tumbleweed-detection.patch
View File

@ -7,7 +7,7 @@ Index: virt-manager-1.3.2/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.3.2/virtinst/urlfetcher.py
@@ -457,9 +457,6 @@ def _distroFromSUSEContent(fetcher, arch
@@ -464,9 +464,6 @@ def _distroFromSUSEContent(fetcher, arch
dclass = OpensuseDistro
if distro_version is None:
distro_version = ['VERSION', distribution[0].strip().rsplit(':')[4]]
@ -17,7 +17,7 @@ Index: virt-manager-1.3.2/virtinst/urlfetcher.py
if distro_version is None:
return None
@@ -1011,7 +1008,11 @@ class SuseDistro(Distro):
@@ -1018,7 +1015,11 @@ class SuseDistro(Distro):
if sp_version:
self.os_variant += sp_version
else: