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.
|
|
|
|
|
|
Accepting request 400351 from home:jfehlig:branches:Virtualization
- Update to libvirt 1.3.5
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
e4d131b8-mv-virDomainDefPostParseInternal.patch,
3e428670-post-parse-implicit-video.patch,
538012c8-default-vram.patch, 96b21fb0-vram-tests.patch,
400e716d-libxl-noprope-emulator.patch,
b90c4b5f-tests-use-qemu-xen.patch,
fccf2725-libxl-API-4.4.patch,
5325123d-libxl-migv2-save-restore.patch,
f9edcfa4-libxl-migv2-migration.patch,
a1c9a81a-libxl-rbd-fix.patch,
ba566428-libxl-dom-iface-addrs.patch
- spec: simplify and cleanup by removing many conditionals that
are never toogled. Also drop conditionals for suse_version <
1310
OBS-URL: https://build.opensuse.org/request/show/400351
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=538
2016-06-07 04:00:39 +02:00
|
|
|
Index: libvirt-1.3.5/src/libxl/libxl_conf.c
|
2016-03-03 23:44:56 +01:00
|
|
|
===================================================================
|
Accepting request 400351 from home:jfehlig:branches:Virtualization
- Update to libvirt 1.3.5
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
e4d131b8-mv-virDomainDefPostParseInternal.patch,
3e428670-post-parse-implicit-video.patch,
538012c8-default-vram.patch, 96b21fb0-vram-tests.patch,
400e716d-libxl-noprope-emulator.patch,
b90c4b5f-tests-use-qemu-xen.patch,
fccf2725-libxl-API-4.4.patch,
5325123d-libxl-migv2-save-restore.patch,
f9edcfa4-libxl-migv2-migration.patch,
a1c9a81a-libxl-rbd-fix.patch,
ba566428-libxl-dom-iface-addrs.patch
- spec: simplify and cleanup by removing many conditionals that
are never toogled. Also drop conditionals for suse_version <
1310
OBS-URL: https://build.opensuse.org/request/show/400351
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=538
2016-06-07 04:00:39 +02:00
|
|
|
--- libvirt-1.3.5.orig/src/libxl/libxl_conf.c
|
|
|
|
|
+++ libvirt-1.3.5/src/libxl/libxl_conf.c
|
2016-03-03 23:44:56 +01:00
|
|
|
@@ -439,7 +439,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),
|
