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

Accepting request 421371 from Virtualization

Browse Source 
A couple bug fixes for Tumbleweed, Leap 42.2, and SLE12SP2

OBS-URL: https://build.opensuse.org/request/show/421371
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=145
This commit is contained in:
Dominique Leuenberger 2016-08-25 07:57:06 +00:00 committed by Git OBS Bridge
commit 08a4df09f0
4 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
virt-manager.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Aug 19 10:28:19 MDT 2016 - carnold@suse.com
- bsc#994394 - virt-manager does not show up in SLE Classic
"Applications" menu
virtman-desktop.patch
-------------------------------------------------------------------
Wed Aug 17 13:24:50 MDT 2016 - carnold@suse.com
- bsc#989639 - xen cdrom device pass-through fails to start FV
guest
virtinst-use-qemu-for-cdrom-device.patch
-------------------------------------------------------------------
Tue Jul 19 16:23:06 MDT 2016 - carnold@suse.com

4
virt-manager.spec
View File

@ -21,7 +21,7 @@
%define qemu_user "qemu"
%define libvirt_kvm_packages ""
%define libvirt_xen_packages ""
%define preferred_distros "sles12sp1,opensuse42.1"
%define preferred_distros "sles12sp2,opensuse42.2"
%define kvm_packages ""
%define _version 1.4.0
%define _release 0
@ -76,6 +76,7 @@ Patch160: virtinst-xen-drive-type.patch
Patch161: virtinst-xenbus-disk-index-fix.patch
Patch162: virtinst-refresh_before_fetch_pool.patch
Patch163: virtinst-use-xenpae-kernel-for-32bit.patch
Patch164: virtinst-use-qemu-for-cdrom-device.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -195,6 +196,7 @@ machine).
%patch161 -p1
%patch162 -p1
%patch163 -p1
%patch164 -p1
%build
%if %{qemu_user}

18
virtinst-use-qemu-for-cdrom-device.patch Normal file
View File

@ -0,0 +1,18 @@
References: bsc#989639
When the device added is a cdrom device (/dev/sr0), don't use
"phy" as the driver name but instead use "qemu".
Index: virt-manager-1.4.0/virtinst/devicedisk.py
===================================================================
--- virt-manager-1.4.0.orig/virtinst/devicedisk.py
+++ virt-manager-1.4.0/virtinst/devicedisk.py
@@ -550,7 +550,8 @@ class VirtualDisk(VirtualDevice):
# Recommended xen defaults from here:
# https://bugzilla.redhat.com/show_bug.cgi?id=1171550#c9
# If type block, use name=phy. Otherwise do the same as qemu
- if self.conn.is_xen() and self.type == self.TYPE_BLOCK:
+ if self.conn.is_xen() and self.type == self.TYPE_BLOCK and not \
+ self.is_cdrom():
return self.DRIVER_NAME_PHY
if self.conn.check_support(
self.conn.SUPPORT_CONN_DISK_DRIVER_NAME_QEMU):

8
virtman-desktop.patch
View File

@ -1,7 +1,7 @@
Index: virt-manager-1.3.0/data/virt-manager.desktop.in
Index: virt-manager-1.4.0/data/virt-manager.desktop.in
===================================================================
--- virt-manager-1.3.0.orig/data/virt-manager.desktop.in
+++ virt-manager-1.3.0/data/virt-manager.desktop.in
--- virt-manager-1.4.0.orig/data/virt-manager.desktop.in
+++ virt-manager-1.4.0/data/virt-manager.desktop.in
@@ -1,8 +1,19 @@
[Desktop Entry]
_Name=Virtual Machine Manager
@ -16,7 +16,7 @@ Index: virt-manager-1.3.0/data/virt-manager.desktop.in
Terminal=false
-Categories=System;
+Encoding=UTF-8
+Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
+Categories=GTK;GNOME;System;Monitor;Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
+X-KDE-ModuleType=Library
+X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=false