- libxl: advertise system qemu instead of qemu-xen in caps

libxl-qemu-emulator-caps.patch
  FATE#320638

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

libvirt.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar  3 18:40:08 UTC 2016 - jfehlig@suse.com
+
+- libxl: advertise system qemu instead of qemu-xen in caps
+  libxl-qemu-emulator-caps.patch
+  FATE#320638
+
 -------------------------------------------------------------------
 Tue Mar  1 16:07:08 UTC 2016 - jfehlig@suse.com
 

libvirt.spec

@@ -480,6 +480,7 @@ Patch210:       apparmor-no-mount.patch
 Patch211:       qemu-apparmor-screenshot.patch
 Patch212:       libvirt-suse-netcontrol.patch
 Patch213:       lxc-wait-after-eth-del.patch
+Patch214:       libxl-qemu-emulator-caps.patch
 # SocketUser and SocketGroup settings were added to systemd.socket in
 # version 214.  Patch the setting away in earlier systemd
 %if 0%{systemd_version} < 214
@@ -994,6 +995,7 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic.
 %patch211 -p1
 %patch212 -p1
 %patch213 -p1
+%patch214 -p1
 %if 0%{systemd_version} < 214
 %patch300 -p1
 %endif

libxl-qemu-emulator-caps.patch

@@ -0,0 +1,23 @@
+libxl: advertise system qemu instead of qemu-xen in caps
+
+Xen in SLE12 SP2, openSUSE Leap 42.2, and Tumbleweed will no
+longer provide qemu-xen (aka qemu-upstream). Instead, the
+qemu binary from the distro qemu package will be used. Change
+the libvirt capabilities to advertise /usr/bin/qemu-system-x86_64
+as the default <emulator>, instead of the qemu-xen one.
+
+See FATE#320638 for details.
+
+Index: libvirt-1.3.2/src/libxl/libxl_conf.c
+===================================================================
+--- libvirt-1.3.2.orig/src/libxl/libxl_conf.c
++++ libvirt-1.3.2/src/libxl/libxl_conf.c
+@@ -439,7 +439,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC
+         if ((guest = virCapabilitiesAddGuest(caps,
+                                              guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN,
+                                              guest_archs[i].arch,
+-                                             LIBXL_EXECBIN_DIR "/qemu-system-i386",
++                                             BINDIR "/qemu-system-x86_64",
+                                              (guest_archs[i].hvm ?
+                                               LIBXL_FIRMWARE_DIR "/hvmloader" :
+                                               NULL),