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> --- configure.ac | 8 -------- src/xen/xen_hypervisor.c | 6 +----- src/xen/xm_internal.c | 9 ++------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 9e26b8c..b4292ba 100644 --- a/configure.ac +++ b/configure.ac @@ -634,14 +634,6 @@ fi AM_CONDITIONAL([WITH_SYSCTL], test "$with_sysctl" = "yes") 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_DEFINE_UNQUOTED([IP_PATH], "$IP_PATH", [path to ip binary]) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 79b25b3..0177f83 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -120,11 +120,7 @@ typedef privcmd_hypercall_t hypercall_t; # define __HYPERVISOR_domctl 36 #endif -#ifdef WITH_RHEL5_API -# define SYS_IFACE_MIN_VERS_NUMA 3 -#else -# define SYS_IFACE_MIN_VERS_NUMA 4 -#endif +#define SYS_IFACE_MIN_VERS_NUMA 4 static int xen_ioctl_hypercall_cmd; static struct xenHypervisorVersions hv_versions = { diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 10c9097..fba814a 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -55,13 +55,8 @@ VIR_LOG_INIT("xen.xm_internal"); -#ifdef WITH_RHEL5_API -# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0 -# 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 +#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3 +#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3 /* The true Xen limit varies but so far is always way less than 1024, which is the Linux kernel limit according -- 2.9.3