From e65812d47934d7ea1b735ea864237ef6fd089936 Mon Sep 17 00:00:00 2001
From: Matthias Bolte
Date: Mon, 8 Nov 2010 17:32:02 +0100
Subject: [PATCH] xen-proxy: Remove it entirely and use libvirtd instead
Suggested by danpb, as it's not up-to-date anymore and
lacks many functions that were added to libvirtd.
---
.gitignore | 1 +
Makefile.am | 2 +-
autobuild.sh | 3 +-
cfg.mk | 1 -
configure.ac | 26 +-
docs/uri.html.in | 3 +-
include/libvirt/virterror.h | 2 +-
libvirt.spec.in | 14 +-
po/POTFILES.in | 1 -
proxy/.gitignore | 5 -
proxy/Makefile.am | 42 --
proxy/libvirt_proxy.c | 856 -----------------------
src/Makefile.am | 1 -
src/conf/cpu_conf.c | 2 -
src/conf/cpu_conf.h | 6 +-
src/conf/domain_conf.c | 17 -
src/conf/domain_conf.h | 2 -
src/conf/nwfilter_params.c | 3 -
src/conf/storage_encryption_conf.c | 3 -
src/util/util.c | 67 +-
src/xen/proxy_internal.c | 1044 ----------------------------
src/xen/proxy_internal.h | 100 ---
src/xen/xen_driver.c | 56 +-
src/xen/xen_driver.h | 20 +-
src/xen/xen_hypervisor.c | 34 +-
src/xen/xen_hypervisor.h | 1 -
src/xen/xend_internal.c | 56 +-
src/xen/xs_internal.c | 78 +--
src/xen/xs_internal.h | 3 -
29 files changed, 75 insertions(+), 2374 deletions(-)
delete mode 100644 proxy/.gitignore
delete mode 100644 proxy/Makefile.am
delete mode 100644 proxy/libvirt_proxy.c
delete mode 100644 src/xen/proxy_internal.c
delete mode 100644 src/xen/proxy_internal.h
diff --git a/.gitignore b/.gitignore
index b7eae66a92..fc3e9d5ff1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
.sc-start-sc_*
/GNUmakefile
/libvirt-[0-9]*
+/proxy/
/maint.mk
ABOUT-NLS
COPYING
diff --git a/Makefile.am b/Makefile.am
index 26c64885bd..d05b7da0e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
LCOV = lcov
GENHTML = genhtml
-SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
+SUBDIRS = gnulib/lib include src daemon tools docs gnulib/tests \
python tests po examples/domain-events/events-c examples/hellolibvirt \
examples/dominfo examples/domsuspend examples/python examples/apparmor \
examples/xml/nwfilter examples/openauth examples/systemtap
diff --git a/autobuild.sh b/autobuild.sh
index 4eda788a54..130f72d419 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -17,8 +17,7 @@ rm -rf coverage
./autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \
--enable-test-coverage \
- --enable-compile-warnings=error \
- --with-xen-proxy
+ --enable-compile-warnings=error
# If the MAKEFLAGS envvar does not yet include a -j option,
# add -jN where N depends on the number of processors.
diff --git a/cfg.mk b/cfg.mk
index d238a5f995..16c2ae3c3c 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -346,7 +346,6 @@ msg_gen_function += virLibConnError
msg_gen_function += virLibDomainError
msg_gen_function += virNetworkReportError
msg_gen_function += virNodeDeviceReportError
-msg_gen_function += virProxyError
msg_gen_function += virRaiseError
msg_gen_function += virReportErrorHelper
msg_gen_function += virReportSystemError
diff --git a/configure.ac b/configure.ac
index 6b30d908d4..445bcfe13b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1893,29 +1893,6 @@ if test "$enable_locking" = "yes"; then
fi
AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"])
-dnl Enable building the proxy?
-
-AC_ARG_WITH([xen-proxy],
- AC_HELP_STRING([--with-xen-proxy], [add XEN setuid proxy support @<:@default=auto@:>@]),[],[with_xen_proxy=auto])
-
-AC_MSG_CHECKING([if Xen setuid proxy is needed])
-if test "$with_xen_proxy" = "auto"; then
- if test "$with_polkit" = "yes"; then
- with_xen_proxy="no"
- else
- with_xen_proxy="yes"
- fi
-fi
-if test "$with_xen" != "yes"; then
- with_xen_proxy="no"
-fi
-AC_MSG_RESULT([$with_xen_proxy])
-
-AM_CONDITIONAL([WITH_PROXY],[test "$with_xen_proxy" = "yes"])
-if test "$with_xen_proxy" = "yes"; then
- AC_DEFINE([WITH_PROXY], 1, [Whether Xen proxy is enabled])
-fi
-
dnl Enable building libvirtd?
AM_CONDITIONAL([WITH_LIBVIRTD],[test "x$with_libvirtd" = "xyes"])
@@ -2258,7 +2235,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
python/Makefile python/tests/Makefile \
daemon/Makefile \
tools/Makefile \
- tests/Makefile proxy/Makefile \
+ tests/Makefile \
tests/xml2sexprdata/Makefile \
tests/sexpr2xmldata/Makefile \
tests/xmconfigdata/Makefile \
@@ -2281,7 +2258,6 @@ AC_MSG_NOTICE([])
AC_MSG_NOTICE([Drivers])
AC_MSG_NOTICE([])
AC_MSG_NOTICE([ Xen: $with_xen])
-AC_MSG_NOTICE([ Proxy: $with_xen_proxy])
AC_MSG_NOTICE([ QEMU: $with_qemu])
AC_MSG_NOTICE([ UML: $with_uml])
AC_MSG_NOTICE([ OpenVZ: $with_openvz])
diff --git a/docs/uri.html.in b/docs/uri.html.in
index 39c308b34f..e6326b2307 100644
--- a/docs/uri.html.in
+++ b/docs/uri.html.in
@@ -302,7 +302,8 @@ connection.
You should consider using libvirt remote support
-in future.
+in future. Since 0.8.6 libvirt doesn't contain
+the Xen proxy anymore and you should use libvirtd instead.