forked from pool/libvirt
f167ba3466
- apparmor: don't fail on non-apparmor <seclabel> apparmor-errormsg-fix.patch, apparmor-alt-seclabel.patch bsc#1023436 - libxl: fix reporting of domain maximum memory ff225538-libxl-autoballoon-setting.patch, c89a6e78-libxl-physinfo-cleanup.patch, d2b77608-libxl-maxmem-fix.patch, 79692c38-libxl-dom0-maxmem.patch bsc#1017762 - libxl: set disk format to raw if not specified and fix disk detach 321a28c6-libxl-default-disk-format.patch, bd116810-libxl-fix-disk-detach.patch bsc#1003379 - libxl: fix timer configurations 6e4759d0-libxl-timer-fix.patch, 87df87e0-libxl-timer-tsc-emulate.patch, b4386fda-xenconfig-timer-fix.patch, d3970925-timer-tests.patch bsc#1019969 OBS-URL: https://build.opensuse.org/request/show/456194 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=583
32 lines
1.4 KiB
Diff
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.0.0/src/libxl/libxl_capabilities.c
|
|
===================================================================
|
|
--- libvirt-3.0.0.orig/src/libxl/libxl_capabilities.c
|
|
+++ libvirt-3.0.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
|
|
@@ -489,7 +490,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),
|