External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: remove legacy hack for RHEL-5 Xen

Browse Source 
We dropped support for RHEL-5 vintage Xen a while ago,
but forgot to remove some of the hacks for it.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-11-09 17:27:50 +00:00
parent ec00fc016a
commit b353cc3c3a
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -634,14 +634,6 @@ fi
AM_CONDITIONAL([WITH_SYSCTL], test "$with_sysctl" = "yes") AM_CONDITIONAL([WITH_SYSCTL], test "$with_sysctl" = "yes")
AC_MSG_RESULT($with_sysctl) AC_MSG_RESULT($with_sysctl)
dnl RHEL-5 has a peculiar version of Xen, which requires some special casing
AC_ARG_WITH([rhel5-api],
[AS_HELP_STRING([--with-rhel5-api=@<:@ARG@:>@],
[build for the RHEL-5 API @<:@default=no@:>@])])
if test x"$with_rhel5_api" = x"yes"; then
AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API])
fi
AC_PATH_PROG([IP_PATH], [ip], /sbin/ip, [/usr/sbin:$PATH]) AC_PATH_PROG([IP_PATH], [ip], /sbin/ip, [/usr/sbin:$PATH])
AC_DEFINE_UNQUOTED([IP_PATH], "$IP_PATH", [path to ip binary]) AC_DEFINE_UNQUOTED([IP_PATH], "$IP_PATH", [path to ip binary])

6
src/xen/xen_hypervisor.c
View File

@ -120,11 +120,7 @@ typedef privcmd_hypercall_t hypercall_t;
# define __HYPERVISOR_domctl 36 # define __HYPERVISOR_domctl 36
#endif #endif
#ifdef WITH_RHEL5_API #define SYS_IFACE_MIN_VERS_NUMA 4
# define SYS_IFACE_MIN_VERS_NUMA 3
#else
# define SYS_IFACE_MIN_VERS_NUMA 4
#endif
static int xen_ioctl_hypercall_cmd; static int xen_ioctl_hypercall_cmd;
static struct xenHypervisorVersions hv_versions = { static struct xenHypervisorVersions hv_versions = {

9
src/xen/xm_internal.c
View File

@ -55,13 +55,8 @@
VIR_LOG_INIT("xen.xm_internal"); VIR_LOG_INIT("xen.xm_internal");
#ifdef WITH_RHEL5_API #define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0 #define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
#else
# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
#endif
/* The true Xen limit varies but so far is always way /* The true Xen limit varies but so far is always way
less than 1024, which is the Linux kernel limit according less than 1024, which is the Linux kernel limit according