提交 b353cc3c 编写于 作者: D Daniel P. Berrange

xen: remove legacy hack for RHEL-5 Xen

We dropped support for RHEL-5 vintage Xen a while ago,
but forgot to remove some of the hacks for it.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 ec00fc01
...@@ -634,14 +634,6 @@ fi ...@@ -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])
......
...@@ -120,11 +120,7 @@ typedef privcmd_hypercall_t hypercall_t; ...@@ -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 = {
......
...@@ -55,13 +55,8 @@ ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册