From 893c15f64f05702249754c95a093c85840a65eea Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Mon, 3 Jun 2019 22:07:43 +0000
Subject: [PATCH] - Make sure the old qemu-dm is not used for installing VMs.
 It   can't handle directl kernel boot. (bsc#1125725)  
 virtinst-set-qemu-emulator.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=470
---
 virt-manager.changes                  |  7 +++++++
 virt-manager.spec                     |  4 +++-
 virtinst-add-pvh-support.patch        |  2 +-
 virtinst-s390x-disable-graphics.patch |  4 ++--
 virtinst-set-qemu-emulator.patch      | 18 ++++++++++++++++++
 5 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 virtinst-set-qemu-emulator.patch

diff --git a/virt-manager.changes b/virt-manager.changes
index 6efa75b2..6f9a0124 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun  3 16:03:39 MDT 2019 - carnold@suse.com
+
+- Make sure the old qemu-dm is not used for installing VMs. It
+  can't handle directl kernel boot. (bsc#1125725)
+  virtinst-set-qemu-emulator.patch
+
 -------------------------------------------------------------------
 Thu May 23 08:17:01 MDT 2019 - carnold@suse.com
 
diff --git a/virt-manager.spec b/virt-manager.spec
index 13a3b645..35a30d91 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -71,6 +71,7 @@ Patch74:        virtman-dont-allow-grub.xen-to-be-deleted.patch
 Patch75:        virtinst-pvgrub2-bootloader.patch
 Patch76:        virtinst-change-location-for-grub_xen.patch
 Patch77:        virtman-fix-env-script-interpreter.patch
+Patch78:        virtinst-set-qemu-emulator.patch
 # Features or Enhancements
 Patch101:       virtman-default-guest-from-host-os.patch
 Patch102:       virtman-default-to-xen-pv.patch
@@ -225,6 +226,7 @@ machine).
 %patch75 -p1
 %patch76 -p1
 %patch77 -p1
+%patch78 -p1
 # Enhancements
 %patch101 -p1
 %patch102 -p1
diff --git a/virtinst-add-pvh-support.patch b/virtinst-add-pvh-support.patch
index fa008156..4a9f68d0 100644
--- a/virtinst-add-pvh-support.patch
+++ b/virtinst-add-pvh-support.patch
@@ -32,7 +32,7 @@ Index: virt-manager-2.1.0/virtinst/guest.py
 ===================================================================
 --- virt-manager-2.1.0.orig/virtinst/guest.py
 +++ virt-manager-2.1.0/virtinst/guest.py
-@@ -608,7 +608,7 @@ class Guest(XMLBuilder):
+@@ -612,7 +612,7 @@ class Guest(XMLBuilder):
  
          usb_tablet = False
          usb_keyboard = False
diff --git a/virtinst-s390x-disable-graphics.patch b/virtinst-s390x-disable-graphics.patch
index 021f36a0..4809b89e 100644
--- a/virtinst-s390x-disable-graphics.patch
+++ b/virtinst-s390x-disable-graphics.patch
@@ -25,7 +25,7 @@ Index: virt-manager-2.1.0/virtinst/guest.py
              return True
  
          return False
-@@ -646,7 +649,7 @@ class Guest(XMLBuilder):
+@@ -650,7 +653,7 @@ class Guest(XMLBuilder):
          self.add_device(dev)
  
      def _add_default_video_device(self):
@@ -34,7 +34,7 @@ Index: virt-manager-2.1.0/virtinst/guest.py
              return
          if self.devices.video:
              return
-@@ -710,7 +713,7 @@ class Guest(XMLBuilder):
+@@ -714,7 +717,7 @@ class Guest(XMLBuilder):
              return
          if self.os.is_container() and not self.conn.is_vz():
              return
diff --git a/virtinst-set-qemu-emulator.patch b/virtinst-set-qemu-emulator.patch
new file mode 100644
index 00000000..1ed6dfb8
--- /dev/null
+++ b/virtinst-set-qemu-emulator.patch
@@ -0,0 +1,18 @@
+Use the correct qemu emulator based on the architecture.
+We want to get away from using the old qemu-dm emulator
+for Xen HVM guests so default to qemu-system-i386.
+Index: virt-manager-2.1.0/virtinst/guest.py
+===================================================================
+--- virt-manager-2.1.0.orig/virtinst/guest.py
++++ virt-manager-2.1.0/virtinst/guest.py
+@@ -525,6 +525,10 @@ class Guest(XMLBuilder):
+         self._add_default_rng()
+ 
+         self.clock.set_defaults(self)
++        if self.os.is_hvm() and self.type == "xen":
++            # Force not using Xen's old qemu-dm
++            if not self.emulator or "qemu-dm" in self.emulator:
++                self.emulator = "/usr/lib/xen/bin/qemu-system-i386"
+         self.cpu.set_defaults(self)
+         self.features.set_defaults(self)
+         for seclabel in self.seclabels: