From 30f96f27d7fe9c460f8dbe873bf0cec2be2e2ddf Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Tue, 23 Aug 2016 16:40:23 +0000
Subject: [PATCH] - bsc#994394 - virt-manager does not show up in SLE Classic  
 "Applications" menu   virtman-desktop.patch

- bsc#989639 - xen cdrom device pass-through fails to start FV
  guest
  virtinst-use-qemu-for-cdrom-device.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=327
---
 virt-manager.changes                     | 14 ++++++++++++++
 virt-manager.spec                        |  4 +++-
 virtinst-use-qemu-for-cdrom-device.patch | 18 ++++++++++++++++++
 virtman-desktop.patch                    |  8 ++++----
 4 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 virtinst-use-qemu-for-cdrom-device.patch

diff --git a/virt-manager.changes b/virt-manager.changes
index 3c12c069..19c3c0fe 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -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
 
diff --git a/virt-manager.spec b/virt-manager.spec
index fef063d8..2da8e70c 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -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}
diff --git a/virtinst-use-qemu-for-cdrom-device.patch b/virtinst-use-qemu-for-cdrom-device.patch
new file mode 100644
index 00000000..b9311230
--- /dev/null
+++ b/virtinst-use-qemu-for-cdrom-device.patch
@@ -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):
diff --git a/virtman-desktop.patch b/virtman-desktop.patch
index 620eb6d0..bf2bf4a2 100644
--- a/virtman-desktop.patch
+++ b/virtman-desktop.patch
@@ -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