forked from pool/libvirt
0d01ad3986
- Update to libvirt 3.6.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Fix unit tests on s390x and ppc64 8982f3ab-util-hash-header.patch, 0b1ecf7b-virHashCodeGen-mockable.patch. f536b0dd-tests-arch-independent-hash.patch - Patch cleanup - Renamed libvirtd-defaults.patch to suse-libvirtd-disable-tls.patch - Renamed libvirtd-init-script.patch to suse-libvirtd-sysconfig-settings.patch - Renamed virtlockd-init-script.patch to suse-virtlockd-sysconfig-settings.patch - Renamed virtlogd-init-script.patch to suse-virtlogd-sysconfig-settings.patch - Renamed libvirt-guests-init-script.patch to suse-libvirt-guests-service.patch - Combined suse-libvirtd-service.patch and systemd-service-xen.patch to suse-libvirtd-service-xen.patch since both patches add Xen support to libvirtd service file - Pull OVMF-related changes from suse-qemu-conf.patch into a new suse-ovmf-paths.patch - Add a supportconfig plugin libvirt-supportconfig FATE#323661 OBS-URL: https://build.opensuse.org/request/show/514264 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=615
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.6.0/src/libxl/libxl_capabilities.c
|
|
===================================================================
|
|
--- libvirt-3.6.0.orig/src/libxl/libxl_capabilities.c
|
|
+++ libvirt-3.6.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
|
|
@@ -506,7 +507,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),
|