ChangeSet 1.1533, 2005/05/24 20:00:14+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
migrate.py, params.py, SrvDaemon.py, xend, Makefile:
Remove xfrd now that save/restore doesn't use xfrd anymore.
console.py:
Remove/disable debug output.
.del-check_twisted~f74b05eb88f208a1:
Delete: tools/check/check_twisted
xend:
Twisted is no longer used -- remove check whether it's installed or
not.
.del-Makefile~474b093f3e64d016:
Delete: tools/xfrd/Makefile
.del-xfrdClient.py~d1d33f981191dfa:
Delete: tools/xfrd/xfrdClient.py
.del-xfrd.h~54f8ea6e77cf4f26:
Delete: tools/xfrd/xfrd.h
.del-xfrd.c~e3be851c3a4297a5:
Delete: tools/xfrd/xfrd.c
.del-xen_domain.h~4a0c609ff18c63a8:
Delete: tools/xfrd/xen_domain.h
.del-xen_domain.c~cd85f330a909fbce:
Delete: tools/xfrd/xen_domain.c
.del-select.h~348b2b069dd5748:
Delete: tools/xfrd/select.h
.del-select.c~373282d5f920303d:
Delete: tools/xfrd/select.c
.del-marshal.h~9929a72563171372:
Delete: tools/xfrd/marshal.h
.del-marshal.c~3108fab658d2220:
Delete: tools/xfrd/marshal.c
.del-lzi_stream.h~49308e7b16ba42e3:
Delete: tools/xfrd/lzi_stream.h
.del-lzi_stream.c~e1870394f081f255:
Delete: tools/xfrd/lzi_stream.c
.del-debug.h~c268d8f144e5e4da:
Delete: tools/xfrd/debug.h
.del-connection.h~ac7cb6a42316a421:
Delete: tools/xfrd/connection.h
.del-connection.c~c025e96fc5649424:
Delete: tools/xfrd/connection.c
.del-Make.xfrd~5a18d2f63aad1d40:
Delete: tools/xfrd/Make.xfrd
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
b/tools/Makefile | 1
b/tools/examples/init.d/xend | 2
b/tools/misc/xend | 31
b/tools/python/xen/xend/server/SrvDaemon.py | 24
b/tools/python/xen/xend/server/console.py | 1
b/tools/python/xen/xend/server/params.py | 1
b/tools/python/xen/xm/migrate.py | 3
tools/check/check_twisted | 46 -
tools/xfrd/Make.xfrd | 34
tools/xfrd/Makefile | 77 -
tools/xfrd/connection.c | 195 ----
tools/xfrd/connection.h | 36
tools/xfrd/debug.h | 73 -
tools/xfrd/lzi_stream.c | 533 -----------
tools/xfrd/lzi_stream.h | 35
tools/xfrd/marshal.c | 207 ----
tools/xfrd/marshal.h | 42
tools/xfrd/select.c | 50 -
tools/xfrd/select.h | 16
tools/xfrd/xen_domain.c | 338 -------
tools/xfrd/xen_domain.h | 22
tools/xfrd/xfrd.c | 1268 ----------------------------
tools/xfrd/xfrd.h | 17
tools/xfrd/xfrdClient.py | 124 --
24 files changed, 4 insertions(+), 3172 deletions(-)
diff -Nru a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile 2005-05-24 16:02:22 -04:00
+++ b/tools/Makefile 2005-05-24 16:02:22 -04:00
@@ -8,7 +8,6 @@
SUBDIRS += examples
SUBDIRS += xentrace
SUBDIRS += python
-SUBDIRS += xfrd
SUBDIRS += xcs
SUBDIRS += xcutils
SUBDIRS += pygrub
diff -Nru a/tools/check/check_twisted b/tools/check/check_twisted
--- a/tools/check/check_twisted 2005-05-24 16:02:22 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-# CHECK-INSTALL
-# -*- mode: python; -*-
-
-import os
-import sys
-
-def hline():
- print >>sys.stderr, "*" * 70
-
-def msg(message):
- print >>sys.stderr, "*" * 3, message
-
-def check_twisted_version():
- """Check twisted is installed with a supported version and print a warning
if not.
- Raises an error if twisted is not installed.
- """
- # Supported twisted release and major version.
- RELEASE = 1
- MAJOR = 3
- try:
- from twisted.copyright import version
- except ImportError:
- hline()
- msg("The Twisted framework is not installed.")
- msg("Use 'make install-twisted' at the xen root to install.")
- msg("")
- msg("Alternatively download and install version %d.%d or higher" %
(RELEASE, MAJOR))
- msg("from http://www.twistedmatrix.com/products";)
- hline()
- sys.exit(1)
-
- (release, major, minor) = version.split('.')
- release = int(release)
- major = int(major)
- if release > RELEASE: return
- if release == RELEASE and major >= MAJOR: return
- hline()
- msg("Warning: Twisted version not supported: %s" % version)
- msg("Use Twisted version %d.%d.0 or higher" % (RELEASE, MAJOR))
- hline()
- sys.exit(1)
-
-if __name__ == '__main__':
- check_twisted_version()
-
diff -Nru a/tools/examples/init.d/xend b/tools/examples/init.d/xend
--- a/tools/examples/init.d/xend 2005-05-24 16:02:22 -04:00
+++ b/tools/examples/init.d/xend 2005-05-24 16:02:22 -04:00
@@ -11,7 +11,7 @@
exit 0
fi
-# Wait for Xend / Xfrd to be up
+# Wait for Xend and xcs to be up
function await_daemons_up
{
i=1
diff -Nru a/tools/misc/xend b/tools/misc/xend
--- a/tools/misc/xend 2005-05-24 16:02:22 -04:00
+++ b/tools/misc/xend 2005-05-24 16:02:22 -04:00
@@ -60,36 +60,6 @@
hline()
raise CheckError("logging is not installed")
-def check_twisted_version():
- """Check twisted is installed with a supported version and print a warning
if not.
- Raises an error if twisted is not installed.
- """
- # Supported twisted release and major version.
- RELEASE = 1
- MAJOR = 3
- try:
- from twisted.copyright import version
- except ImportError:
- hline()
- msg("The Twisted framework is not installed.")
- msg("Use 'make install-twisted' at the xen root to install.")
- msg("")
- msg("Alternatively download and install version %d.%d or higher" %
(RELEASE, MAJOR))
- msg("from http://www.twistedmatrix.com/products";)
- hline()
- raise CheckError("twisted is not installed")
-
-
- (release, major, minor) = version.split('.')
- release = int(release)
- major = int(major)
- if release > RELEASE: return
- if release == RELEASE and major >= MAJOR: return
- hline()
- msg("Warning: Twisted version not supported: %s" % version)
- msg("Use Twisted version %d.%d.0 or higher" % (RELEASE, MAJOR))
- hline()
-
def check_user():
"""Check that the effective user id is 0 (root).
"""
@@ -146,7 +116,6 @@
def main():
try:
check_logging()
- check_twisted_version()
check_user()
except CheckError:
sys.exit(1)
diff -Nru a/tools/python/xen/xend/server/SrvDaemon.py
b/tools/python/xen/xend/server/SrvDaemon.py
--- a/tools/python/xen/xend/server/SrvDaemon.py 2005-05-24 16:02:22 -04:00
+++ b/tools/python/xen/xend/server/SrvDaemon.py 2005-05-24 16:02:22 -04:00
@@ -128,21 +128,16 @@
def cleanup_xend(self, kill=False):
return self.cleanup_process(XEND_PID_FILE, "xend", kill)
- def cleanup_xfrd(self, kill=False):
- return self.cleanup_process(XFRD_PID_FILE, "xfrd", kill)
-
def cleanup(self, kill=False):
self.cleanup_xend(kill=kill)
- self.cleanup_xfrd(kill=kill)
def status(self):
- """Returns the status of the xend and xfrd daemons.
+ """Returns the status of the xend daemon.
The return value is defined by the LSB:
0 Running
3 Not running
"""
- if (self.cleanup_process(XEND_PID_FILE, "xend", False) == 0 or
- self.cleanup_process(XFRD_PID_FILE, "xfrd", False) == 0):
+ if self.cleanup_process(XEND_PID_FILE, "xend", False) == 0:
return 3
else:
return 0
@@ -171,17 +166,6 @@
pidfile.close()
return pid
- def start_xfrd(self):
- """Fork and exec xfrd, writing its pid to XFRD_PID_FILE.
- """
- if self.fork_pid(XFRD_PID_FILE):
- # Parent
- pass
- else:
- # Child
- self.daemonize()
- os.execl("/usr/sbin/xfrd", "xfrd")
-
def daemonize(self):
if not DAEMONIZE: return
# Detach from TTY.
@@ -212,15 +196,11 @@
4 Insufficient privileges
"""
xend_pid = self.cleanup_xend()
- xfrd_pid = self.cleanup_xfrd()
-
if self.set_user():
return 4
os.chdir("/")
- if xfrd_pid == 0:
- self.start_xfrd()
if xend_pid > 0:
# Trying to run an already-running service is a success.
return 0
diff -Nru a/tools/python/xen/xend/server/console.py
b/tools/python/xen/xend/server/console.py
--- a/tools/python/xen/xend/server/console.py 2005-05-24 16:02:22 -04:00
+++ b/tools/python/xen/xend/server/console.py 2005-05-24 16:02:22 -04:00
@@ -246,7 +246,6 @@
def disconnect(self, conn=None):
"""Disconnect the TCP connection to the console.
"""
- print 'ConsoleDev>disconnect>', conn
try:
self.lock.acquire()
if conn and conn != self.conn: return
diff -Nru a/tools/python/xen/xend/server/params.py
b/tools/python/xen/xend/server/params.py
--- a/tools/python/xen/xend/server/params.py 2005-05-24 16:02:22 -04:00
+++ b/tools/python/xen/xend/server/params.py 2005-05-24 16:02:22 -04:00
@@ -1,6 +1,5 @@
# The following parameters could be placed in a configuration file.
XEND_PID_FILE = '/var/run/xend.pid'
-XFRD_PID_FILE = '/var/run/xfrd.pid'
XEND_TRACE_FILE = '/var/log/xend.trace'
XEND_USER = 'root'
diff -Nru a/tools/python/xen/xm/migrate.py b/tools/python/xen/xm/migrate.py
--- a/tools/python/xen/xm/migrate.py 2005-05-24 16:02:22 -04:00
+++ b/tools/python/xen/xm/migrate.py 2005-05-24 16:02:22 -04:00
@@ -14,8 +14,7 @@
gopts = Opts(use="""[options] DOM HOST
Migrate domain DOM to host HOST.
-The transfer daemon xfrd must be running on the
-local host and on HOST.
+Xend must be running on the local host and on HOST.
""")
gopts.opt('help', short='h',
diff -Nru a/tools/xfrd/Make.xfrd b/tools/xfrd/Make.xfrd
--- a/tools/xfrd/Make.xfrd 2005-05-24 16:02:22 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,34 +0,0 @@
-# -*- mode: Makefile; -*-
-#============================================================================
-
-UTIL_LIB = libutil.a
-
-UTIL_LIB_SRC =
-UTIL_LIB_SRC += allocate.c
-UTIL_LIB_SRC += enum.c
-UTIL_LIB_SRC += fd_stream.c
-UTIL_LIB_SRC += file_stream.c
-UTIL_LIB_SRC += gzip_stream.c
-UTIL_LIB_SRC += hash_table.c
-UTIL_LIB_SRC += iostream.c
-UTIL_LIB_SRC += lexis.c
-UTIL_LIB_SRC += lzi_stream.c
-UTIL_LIB_SRC += marshal.c
-UTIL_LIB_SRC += string_stream.c
-UTIL_LIB_SRC += sxpr.c
-UTIL_LIB_SRC += sxpr_parser.c
-UTIL_LIB_SRC += sys_net.c
-UTIL_LIB_SRC += sys_string.c
-#UTIL_LIB_SRC += util.c
-#UTIL_LIB_SRC += xdr.c
-
-#----------------------------------------------------------------------------
-# Xfrd.
-
-XFRD_PROG_SRC =
-XFRD_PROG_SRC += xfrd.c
-XFRD_PROG_SRC += xen_domain.c
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home