forked from pool/libvirt
fcf349cddb
Release candidate 2 of libvirt 3.10.0 for Factory and SLE15 beta4.
- Update to libvirt 3.10.0 RC2
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
8056721c-qemu-null-storage-source.patch,
74a13be4-xdr-flags.patch,
apparmor-rules-for-new-mediation-features.patch,
apparmor-fine-grained-mount-rules.patch
- bsc#1070478, FATE#324479
- spec: remove use of 'systemctl enable'
bsc#1038401
- spec: enable firewalld support for SLE15, Leap15, and Tumbleweed
FATE#320794
OBS-URL: https://build.opensuse.org/request/show/547315
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=644
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.10.0/src/libxl/libxl_capabilities.c
|
|
===================================================================
|
|
--- libvirt-3.10.0.orig/src/libxl/libxl_capabilities.c
|
|
+++ libvirt-3.10.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),
|