- bsc#992224 - [HPS Bug] During boot of Xen Hypervisor, Failed to

get contiguous memory for DMA from Xen
  57ac6316-don-t-restrict-DMA-heap-to-node-0.patch
- bsc#978755 - xen uefi systems fail to boot
- bsc#983697 - SLES12 SP2 Xen UEFI mode cannot boot
  57b71fc5-x86-EFI-don-t-apply-relocations-to-l-2-3-_bootmap.patch
- Upstream patch from Jan
  57b7447b-dont-permit-guest-to-populate-PoD-pages-for-itself.patch

- spec: to stay compatible with the in-tree qemu-xen binary, use
  /usr/bin/qemu-system-i386 instead of /usr/bin/qemu-system-x86_64
  bsc#986164

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=447

xen.spec

@@ -216,6 +216,9 @@ Patch10:        57a1e603-x86-time-adjust-local-system-time-initialization.patch
 Patch11:        57a1e64c-x86-time-introduce-and-use-rdtsc_ordered.patch
 Patch12:        57a2f6ac-x86-time-calibrate-TSC-against-platform-timer.patch
 Patch13:        57a30261-x86-support-newer-Intel-CPU-models.patch
+Patch14:        57ac6316-don-t-restrict-DMA-heap-to-node-0.patch
+Patch15:        57b71fc5-x86-EFI-don-t-apply-relocations-to-l-2-3-_bootmap.patch
+Patch16:        57b7447b-dont-permit-guest-to-populate-PoD-pages-for-itself.patch
 # Upstream qemu-traditional patches
 Patch250:       VNC-Support-for-ExtendedKeyEvent-client-message.patch
 Patch251:       0001-net-move-the-tap-buffer-into-TAPState.patch
@@ -550,6 +553,9 @@ Authors:
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 # Upstream qemu patches
 %patch250 -p1
 %patch251 -p1
@@ -762,7 +768,7 @@ configure_flags="${configure_flags} --disable-qemu-traditional"
 %endif
 	--with-system-ovmf=%{_datadir}/qemu/ovmf-x86_64-ms.bin \
 	--with-system-seabios=%{_datadir}/qemu/bios-256k.bin \
-	--with-system-qemu=%{_bindir}/qemu-system-%{_arch} \
+	--with-system-qemu=%{_bindir}/qemu-system-i386 \
         ${configure_flags}
 make -C tools/include/xen-foreign %{?_smp_mflags}
 make %{?_smp_mflags}
@@ -909,12 +915,13 @@ done
 # and advertised as the <emulator> in libvirt capabilities. Tool such as
 # virt-install include <emulator> in domXML they produce, so we need to
 # preserve the path. For x86_64, create a simple wrapper that invokes
-# /usr/bin/qemu-system-x86_64
+# /usr/bin/qemu-system-i386
+# Using qemu-system-x86_64 will result in an incompatible VM
 %ifarch x86_64
 cat > $RPM_BUILD_ROOT/usr/lib/xen/bin/qemu-system-i386 << 'EOF'
 #!/bin/sh
 
-exec %{_bindir}/qemu-system-x86_64 "$@"
+exec %{_bindir}/qemu-system-i386 "$@"
 EOF
 chmod 0755 $RPM_BUILD_ROOT/usr/lib/xen/bin/qemu-system-i386
 %endif