Accepting request 708996 from Virtualization

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/708996
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=195
This commit is contained in:
Dominique Leuenberger 2019-06-12 11:15:50 +00:00 committed by Git OBS Bridge
commit 4606c2389f
5 changed files with 31 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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: