From 68940b3fb3c43b8aa03cb6fd2f1d00b1737c9b2c Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Mon, 14 Jun 2021 11:17:54 -0600 Subject: [PATCH] Xen: Bump minimum supported Xen version to 4.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Platforms supported by libvirt have the following Xen versions openSUSE Leap 15.2: 4.13 openSUSE Leap 15.3: 4.14 Fedora 33: 4.14 Ubuntu 18.04: 4.9 Ubuntu 20.04: 4.11 Debian Stable: 4.11 Bumping the minimum version doesn't allow us to drop much code, but it does provide better alignment with libvirt's platform support statement. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrangé --- meson.build | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index eba6d9f765..02900ff738 100644 --- a/meson.build +++ b/meson.build @@ -1481,7 +1481,7 @@ elif get_option('driver_interface').enabled() endif if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD') - libxl_version = '4.6.0' + libxl_version = '4.9.0' libxl_dep = dependency('xenlight', version: '>=' + libxl_version, required: get_option('driver_libxl')) if libxl_dep.found() @@ -1501,15 +1501,11 @@ if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD') xl_util_dep = dependency('xlutil') xen_store_dep = dependency('xenstore') + xtl_link_dep = dependency('xentoollog') - # xtl_* infrastructure is in libxentoollog since Xen 4.7 previously - # it was in libxenctrl. - if libxl_dep.version().version_compare('>=4.7.0') - xtl_link_dep = dependency('xentoollog') - else - xtl_link_dep = dependency('xenctrl') - endif - + # Upstream Xen failed to advertise LIBXL_API_VERSION 0x040700 and + # 0x040800 until the Xen 4.13 release. For Xen versions 4.9-4.12 + # we'll need to stick with version 0x040500. if libxl_dep.version().version_compare('>=4.13.0') LIBXL_API_VERSION='0x041300' else