libvirt/libxl-qemu-emulator-caps.patch
James Fehlig 14c21278a9 Accepting request 476767 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.1.0
  - Modularize storage driver by splitting it into backend-specific
    subpackages
  - CVE-2017-2635, bsc#1027075
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    b018ada3-shunloadtest-build-fix.patch,
    f86a7a83-libxl-dom0-balloon-fix.patch,
    6e4759d0-libxl-timer-fix.patch,
    87df87e0-libxl-timer-tsc-emulate.patch,
    b4386fda-xenconfig-timer-fix.patch,
    d3970925-timer-tests.patch,
    321a28c6-libxl-default-disk-format.patch,
    bd116810-libxl-fix-disk-detach.patch,
    ff225538-libxl-autoballoon-setting.patch,
    c89a6e78-libxl-physinfo-cleanup.patch,
    d2b77608-libxl-maxmem-fix.patch,
    79692c38-libxl-dom0-maxmem.patch,
    4ab0c959-libxl-mem-leak.patch,
    2dc1cf19-libxl-double-free.patch,
    apparmor-errormsg-fix.patch,
    apparmor-alt-seclabel.patch,
    qemu-disable-namespaces.patch

OBS-URL: https://build.opensuse.org/request/show/476767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=588
2017-03-03 15:02:55 +00:00

32 lines
1.4 KiB
Diff

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-3.1.0/src/libxl/libxl_capabilities.c
===================================================================
--- libvirt-3.1.0.orig/src/libxl/libxl_capabilities.c
+++ libvirt-3.1.0/src/libxl/libxl_capabilities.c
@@ -38,6 +38,7 @@
#include "libxl_capabilities.h"
#include "cpu/cpu_x86.h"
#include "cpu/cpu_x86_data.h"
+#include "configmake.h"
#define VIR_FROM_THIS VIR_FROM_LIBXL
@@ -491,7 +492,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),