2016-03-03 23:44:56 +01:00
|
|
|
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.
|
|
|
|
|
|
2017-12-01 23:52:01 +01:00
|
|
|
Index: libvirt-3.10.0/src/libxl/libxl_capabilities.c
|
2016-03-03 23:44:56 +01:00
|
|
|
===================================================================
|
2017-12-01 23:52:01 +01:00
|
|
|
--- libvirt-3.10.0.orig/src/libxl/libxl_capabilities.c
|
|
|
|
|
+++ libvirt-3.10.0/src/libxl/libxl_capabilities.c
|
2016-10-05 22:52:26 +02:00
|
|
|
@@ -38,6 +38,7 @@
|
2016-07-01 18:39:05 +02:00
|
|
|
#include "libxl_capabilities.h"
|
2016-10-05 22:52:26 +02:00
|
|
|
#include "cpu/cpu_x86.h"
|
|
|
|
|
#include "cpu/cpu_x86_data.h"
|
2016-07-01 18:39:05 +02:00
|
|
|
+#include "configmake.h"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_LIBXL
|
Accepting request 500763 from home:jfehlig:branches:Virtualization
- Update to libvirt 3.4.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
aeda1b8c-qemu-no-error-shutdown.patch,
8023b21a-conf-ioapic.patch, 6b5c6314-qemu-irqchip.patch,
2020e2c6-conf-intremap.patch, 04028a9d-qemu-intremap.patch,
d12781b4-conf-iommu-cache-mode-attr.patch,
a5691448-qemu-iommu-cache-mode.patch,
3a276c65-conf-iommu-def-stability-check.patch,
935d927a-conf-iommu-ABI-stability-check.patch,
4cd3f241-fix-NULL-disk-source.patch,
975ea20f-loopback-macro.patch,
dbb85e0c-libxl-graphics-listen-addr.patch,
libxl-def-usbctrl.patch, revert-2841e675-mtu.patch
- FATE#321335, bsc#1031056, bsc#1037774, bsc#1040207, bsc#1040213
OBS-URL: https://build.opensuse.org/request/show/500763
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=606
2017-06-02 20:08:28 +02:00
|
|
|
@@ -506,7 +507,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC
|
2016-03-03 23:44:56 +01:00
|
|
|
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),
|
