bitkeeper revision 1.1159.1.337 (4187c1ce5397aQbAhDCeojMJeJsAzw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/local/scratch/kaf24/xeno
This commit is contained in:
kaf24@freefall.cl.cam.ac.uk committed 2004-11-02 17:20:14 +00:00
commit ca9b4638d2
10 files changed
+67 -338

No files matched your search

+1 -1
View File
@@ -6,8 +6,8 @@
3eb788d6Kleck_Cut0ouGneviGzliQ Makefile
3f5ef5a24IaQasQE2tyMxrfxskMmvw README
3f9e7d53iC47UnlfORp9iC1vai6kWw docs/Makefile
4187c1c7IWmBinGdI19kL4MuZ6RLbQ docs/check_pkgs
3f9e7d60PWZJeVh5xdnk0nLUdxlqEA docs/figs/xenlogo.eps
418273f3YZUyGIrNbERVAPFeOd9gww docs/figs/xenserver.obj
4022a73cgxX1ryj1HgS-IwwB6NUi2A docs/misc/XenDebugger-HOWTO
412f4bd9sm5mCQ8BkrgKcAKZGadq7Q docs/misc/blkif-drivers-explained.txt
40d6ccbfKKBq8jE0ula4eHEzBiQuDA docs/misc/xen_config.html
+22 -22
View File
@@ -10,8 +10,8 @@
BitKeeper/*/*
PENDING/*
TAGS
Twisted-1.3.0/*
Twisted-1.3.0.tar.gz
Twisted-1.3.0/*
docs/*.aux
docs/*.dvi
docs/*.log
@@ -20,12 +20,32 @@ docs/*.ps
docs/*.toc
docs/figs/xenserver.eps
docs/html/*
docs/ps/*
docs/interface/WARNINGS
docs/interface/images.pl
docs/interface/images.tex
docs/interface/img1.png
docs/interface/index.html
docs/interface/interface.css
docs/interface/interface.html
docs/interface/labels.pl
docs/pdf/*
docs/ps/*
docs/user/WARNINGS
docs/user/images.pl
docs/user/images.tex
docs/user/img1.png
docs/user/img2.png
docs/user/img3.png
docs/user/index.html
docs/user/internals.pl
docs/user/labels.pl
docs/user/user.css
docs/user/user.html
extras/mini-os/h/hypervisor-ifs
install/*
linux-*-xen0/*
linux-*-xenU/*
linux-xen-sparse
netbsd-*-tools/*
netbsd-*-xen0/*
netbsd-*-xenU/*
@@ -53,23 +73,3 @@ xen/tools/figlet/figlet
xen/xen
xen/xen-syms
xen/xen.*
docs/interface/WARNINGS
docs/interface/images.pl
docs/interface/images.tex
docs/interface/img1.png
docs/interface/index.html
docs/interface/interface.css
docs/interface/interface.html
docs/interface/labels.pl
docs/user/WARNINGS
docs/user/images.pl
docs/user/images.tex
docs/user/img1.png
docs/user/img2.png
docs/user/img3.png
docs/user/index.html
docs/user/internals.pl
docs/user/labels.pl
docs/user/user.css
docs/user/user.html
linux-xen-sparse
+3
View File
@@ -14,11 +14,14 @@ SOURCEFORGE_MIRROR := http://heanet.dl.sourceforge.net/sourceforge
all:
$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C xen install
$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C tools install
sh ./docs/check_pkgs && \
$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C docs install
# install everything into the standard system directories
install: dist
$(MAKE) -C xen install
$(MAKE) -C tools install
sh ./docs/check_pkgs && $(MAKE) -C docs install
$(shell cp -a install/boot/*$(LINUX_VER)* /boot/)
$(shell cp -a install/lib/modules/* /lib/modules/)
+22
View File
@@ -0,0 +1,22 @@
silent_which ()
{
if ! `which $1 1>/dev/null 2>/dev/null`; then
echo "*************************************************"
echo "*************************************************"
echo "* WARNING: Package '$1' is required"
echo "* to build Xen documentation"
echo "*************************************************"
echo "*************************************************"
fi
which $1 1>/dev/null 2>/dev/null
}
silent_which latex || exit 1
silent_which latex2html || exit 1
silent_which dvips || exit 1
silent_which ps2pdf || exit 1
silent_which fig2dev || exit 1
silent_which tgif || exit 1
exit 0
-312
View File
@@ -1,312 +0,0 @@
%TGIF 4.1.8
state(0,37,100.000,0,108,0,4,1,16,2,2,2,0,1,2,1,1,'Helvetica-Oblique',2,80640,0,8,1,5,-4,0,1,1,0,16,1,0,1,1,1,1,1088,1408,0,0,2880,0).
%
% @(#)$Header$
% %W%
%
unit("1 pixel/pixel").
color_info(28,65535,0,[
"black", 0, 0, 0, 0, 0, 0, 1,
"gray10", 6682, 6682, 6682, 6682, 6682, 6682, 1,
"gray20", 13107, 13107, 13107, 13107, 13107, 13107, 1,
"gray30", 19789, 19789, 19789, 19789, 19789, 19789, 1,
"gray40", 26214, 26214, 26214, 26214, 26214, 26214, 1,
"gray50", 32639, 32639, 32639, 32639, 32639, 32639, 1,
"gray60", 39321, 39321, 39321, 39321, 39321, 39321, 1,
"gray70", 46003, 46003, 46003, 46003, 46003, 46003, 1,
"gray80", 52428, 52428, 52428, 52428, 52428, 52428, 1,
"gray90", 58853, 58853, 58853, 58853, 58853, 58853, 1,
"white", 65535, 65535, 65535, 65535, 65535, 65535, 1,
"red", 65535, 0, 0, 65535, 0, 0, 1,
"orange", 65535, 42405, 0, 65535, 42405, 0, 1,
"yellow", 65535, 65535, 0, 65535, 65535, 0, 1,
"green", 0, 65535, 0, 0, 65535, 0, 1,
"blue", 0, 0, 65535, 0, 0, 65535, 1,
"blue4", 0, 0, 35723, 0, 0, 35723, 1,
"violet", 61166, 33410, 61166, 61166, 33410, 61166, 1,
"magenta", 65535, 0, 65535, 65535, 0, 65535, 1,
"cyan", 0, 65535, 65535, 0, 65535, 65535, 1,
"wheat", 62965, 57054, 46003, 62965, 57054, 46003, 1,
"wheat3", 52685, 47802, 38550, 52685, 47802, 38550, 1,
"wheat4", 35723, 32382, 26214, 35723, 32382, 26214, 1,
"pink", 65535, 49344, 52171, 65535, 49344, 52171, 1,
"palegreen", 39064, 64507, 39064, 39064, 64507, 39064, 1,
"skyblue", 34695, 52942, 60395, 34695, 52942, 60395, 1,
"CadetBlue", 24415, 40606, 41120, 24415, 40606, 41120, 1,
"DarkSlateGray", 12079, 20303, 20303, 12079, 20303, 20303, 1
]).
script_frac("0.6").
fg_bg_colors('blue4','gray90').
page(1,"",1,'').
group([
rcbox('gray90','',375,225,440,435,1,2,1,8,16,69683,0,0,0,0,'2',0,[
]),
rcbox('gray20','',375,225,440,435,0,2,1,8,16,69684,0,0,0,0,'2',0,[
])
],
69682,0,0,[
]).
group([
rcbox('gray90','',450,225,515,435,1,2,1,8,16,69623,0,0,0,0,'2',0,[
]),
rcbox('gray20','',450,225,515,435,0,2,1,8,16,69624,0,0,0,0,'2',0,[
])
],
69622,0,0,[
]).
group([
rcbox('gray90','',525,225,590,435,1,2,1,8,16,69119,0,0,0,0,'2',0,[
]),
rcbox('gray20','',525,225,590,435,0,2,1,8,16,69120,0,0,0,0,'2',0,[
])
],
69366,0,0,[
]).
box('gray40','',227,457,607,502,1,2,1,69020,0,0,0,0,0,'2',0,[
]).
box('gray40','',235,335,340,435,1,2,1,69017,0,0,0,0,0,'2',0,[
]).
box('gray40','',235,230,340,330,1,2,1,69001,0,0,0,0,0,'2',0,[
]).
box('gray80','',230,330,335,430,1,2,1,68660,0,0,0,0,0,'2',0,[
]).
box('gray80','',230,225,335,325,1,2,1,68663,0,0,0,0,0,'2',0,[
]).
box('gray70','',222,452,602,497,1,2,1,68416,0,0,0,0,0,'2',0,[
]).
text('black',621,451,3,1,1,14,55,68422,18,5,0,-7,0,0,2,14,55,-1,2,"",0,0,0,0,469,'',[
minilines(14,55,-1,2,1,-7,0,[
mini_line(12,18,5,-1,2,0,[
str_block(0,12,18,5,-1,2,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,115200,12,18,5,-1,2,0,0,0,0,0,
"X")])
]),
mini_line(12,18,5,0,1,0,[
str_block(0,12,18,5,0,1,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,115200,12,18,5,0,1,0,0,0,0,0,
"E")])
]),
mini_line(14,18,5,0,1,0,[
str_block(0,14,18,5,0,1,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,115200,14,18,5,0,1,0,0,0,0,0,
"N")])
])
])]).
text('black',282,244,3,1,1,99,60,68643,16,4,0,0,0,0,2,99,60,-1,0,"",0,0,0,0,260,'',[
minilines(99,60,-1,0,1,0,0,[
mini_line(98,16,4,0,0,0,[
str_block(0,98,16,4,0,-4,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,97920,98,16,4,0,-4,0,0,0,0,0,
"Control and ")])
]),
mini_line(99,16,4,-1,0,0,[
str_block(0,99,16,4,-1,0,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,97920,99,16,4,-1,0,0,0,0,0,0,
"Management")])
]),
mini_line(69,16,4,0,0,0,[
str_block(0,69,16,4,0,-1,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,97920,69,16,4,0,-1,0,0,0,0,0,
"Software")])
])
])]).
text('black',280,349,2,1,1,85,42,68748,18,5,0,-4,0,0,2,85,42,0,1,"",0,0,0,0,367,'',[
minilines(85,42,0,1,1,-4,0,[
mini_line(85,18,5,0,1,0,[
str_block(0,85,18,5,0,1,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,115200,85,18,5,0,1,0,0,0,0,0,
"Privileged")])
]),
mini_line(79,18,5,0,0,0,[
str_block(0,79,18,5,0,0,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,115200,79,18,5,0,0,0,0,0,0,0,
"GuestOS")])
])
])]).
text('black',280,393,1,1,1,74,17,68749,14,3,0,-4,0,0,2,74,17,0,0,"",0,0,0,0,407,'',[
minilines(74,17,0,0,1,-4,0,[
mini_line(74,14,3,0,0,0,[
str_block(0,74,14,3,0,0,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,80640,74,14,3,0,0,0,0,0,0,0,
"(XenLinux)")])
])
])]).
box('gray80','',236,459,351,489,1,2,1,68474,0,0,0,0,0,'2',0,[
]).
text('black',291,465,1,1,1,92,17,68470,14,3,0,-4,0,0,2,92,17,0,3,"",0,0,0,0,479,'',[
minilines(92,17,0,3,1,-4,0,[
mini_line(92,14,3,0,3,0,[
str_block(0,92,14,3,0,3,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,80640,92,14,3,0,3,0,0,0,0,0,
"VM control i/f")])
])
])]).
box('gray80','',396,459,586,489,1,2,1,68895,0,0,0,0,0,'2',0,[
]).
text('black',496,465,1,1,1,143,17,68896,14,3,0,-4,0,0,2,143,17,0,1,"",0,0,0,0,479,'',[
minilines(143,17,0,1,1,-4,0,[
mini_line(143,14,3,0,1,0,[
str_block(0,143,14,3,0,1,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,80640,143,14,3,0,1,0,0,0,0,0,
"Virtualized Hardware")])
])
])]).
poly('black','',2,[
355,473,395,473],1,4,1,68913,0,2,0,0,0,0,0,'4',0,0,
"0","",[
0,14,6,0,'14','6','0'],[0,14,6,0,'14','6','0'],[
]).
poly('black','',2,[
280,423,280,453],1,4,1,68941,0,2,0,0,0,0,0,'4',0,0,
"0","",[
0,14,6,0,'14','6','0'],[0,14,6,0,'14','6','0'],[
]).
poly('black','',2,[
255,313,255,343],1,2,1,68983,0,2,0,0,0,0,0,'2',0,0,
"0","",[
0,10,4,0,'10','4','0'],[0,10,4,0,'10','4','0'],[
]).
poly('black','',2,[
305,313,305,343],1,2,1,68984,0,2,0,0,0,0,0,'2',0,0,
"0","",[
0,10,4,0,'10','4','0'],[0,10,4,0,'10','4','0'],[
]).
poly('black','',2,[
280,313,280,343],1,2,1,68989,0,2,0,0,0,0,0,'2',0,0,
"0","",[
0,10,4,0,'10','4','0'],[0,10,4,0,'10','4','0'],[
]).
box('gray70','',284,520,609,555,1,2,1,68490,0,0,0,0,0,'2',0,[
]).
text('black',444,527,1,1,1,276,23,68493,18,5,0,-8,0,0,2,276,23,0,0,"",0,0,0,0,545,'',[
minilines(276,23,0,0,1,-8,0,[
mini_line(276,18,5,0,0,0,[
str_block(0,276,18,5,0,-1,0,0,0,[
str_seg('black','Helvetica-BoldOblique',3,115200,276,18,5,0,-1,0,0,0,0,0,
"H/W (SMP x86, mem, net, block)")])
])
])]).
poly('black','',2,[
445,483,445,518],3,3,1,68528,0,2,0,0,0,0,0,'3',0,0,
"0","",[
0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
]).
poly('black','',2,[
500,483,500,518],3,3,1,68529,0,2,0,0,0,0,0,'3',0,0,
"0","",[
0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
]).
poly('black','',2,[
555,483,555,518],3,3,1,68530,0,2,0,0,0,0,0,'3',0,0,
"0","",[
0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
]).
text('black',405,254,2,1,1,34,36,68698,16,4,0,-4,0,0,2,34,36,0,1,"",0,0,0,0,270,'',[
minilines(34,36,0,1,1,-4,0,[
mini_line(34,16,4,0,1,0,[
str_block(0,34,16,4,0,1,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,34,16,4,0,1,0,0,0,0,0,
"User")])
]),
mini_line(32,16,4,0,1,0,[
str_block(0,32,16,4,0,1,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,32,16,4,0,1,0,0,0,0,0,
"S/W")])
])
])]).
text('black',405,354,3,1,1,44,52,69100,16,4,0,-4,0,0,2,44,52,0,1,"",0,0,0,0,370,'',[
minilines(44,52,0,1,1,-4,0,[
mini_line(34,16,4,0,1,0,[
str_block(0,34,16,4,0,1,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,34,16,4,0,1,0,0,0,0,0,
"User")])
]),
mini_line(44,16,4,0,0,0,[
str_block(0,44,16,4,0,0,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,44,16,4,0,0,0,0,0,0,0,
"Guest")])
]),
mini_line(24,16,4,0,0,0,[
str_block(0,24,16,4,0,0,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,24,16,4,0,0,0,0,0,0,0,
"OS")])
])
])]).
text('black',480,254,2,1,1,34,36,69114,16,4,0,-4,0,0,2,34,36,0,1,"",0,0,0,0,270,'',[
minilines(34,36,0,1,1,-4,0,[
mini_line(34,16,4,0,1,0,[
str_block(0,34,16,4,0,1,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,34,16,4,0,1,0,0,0,0,0,
"User")])
]),
mini_line(32,16,4,0,1,0,[
str_block(0,32,16,4,0,1,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,32,16,4,0,1,0,0,0,0,0,
"S/W")])
])
])]).
text('black',480,354,3,1,1,44,52,69115,16,4,0,-4,0,0,2,44,52,0,1,"",0,0,0,0,370,'',[
minilines(44,52,0,1,1,-4,0,[
mini_line(34,16,4,0,1,0,[
str_block(0,34,16,4,0,1,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,34,16,4,0,1,0,0,0,0,0,
"User")])
]),
mini_line(44,16,4,0,0,0,[
str_block(0,44,16,4,0,0,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,44,16,4,0,0,0,0,0,0,0,
"Guest")])
]),
mini_line(24,16,4,0,0,0,[
str_block(0,24,16,4,0,0,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,24,16,4,0,0,0,0,0,0,0,
"OS")])
])
])]).
text('black',555,254,2,1,1,34,36,69116,16,4,0,-4,0,0,2,34,36,0,1,"",0,0,0,0,270,'',[
minilines(34,36,0,1,1,-4,0,[
mini_line(34,16,4,0,1,0,[
str_block(0,34,16,4,0,1,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,34,16,4,0,1,0,0,0,0,0,
"User")])
]),
mini_line(32,16,4,0,1,0,[
str_block(0,32,16,4,0,1,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,32,16,4,0,1,0,0,0,0,0,
"S/W")])
])
])]).
text('black',555,354,3,1,1,44,52,69117,16,4,0,-4,0,0,2,44,52,0,1,"",0,0,0,0,370,'',[
minilines(44,52,0,1,1,-4,0,[
mini_line(34,16,4,0,1,0,[
str_block(0,34,16,4,0,1,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,34,16,4,0,1,0,0,0,0,0,
"User")])
]),
mini_line(44,16,4,0,0,0,[
str_block(0,44,16,4,0,0,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,44,16,4,0,0,0,0,0,0,0,
"Guest")])
]),
mini_line(24,16,4,0,0,0,[
str_block(0,24,16,4,0,0,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,97920,24,16,4,0,0,0,0,0,0,0,
"OS")])
])
])]).
text('black',282,201,1,1,1,116,17,69753,14,3,2,-4,0,0,2,116,17,0,2,"",0,0,0,0,215,'',[
minilines(116,17,0,2,1,-4,0,[
mini_line(116,14,3,0,2,0,[
str_block(0,116,14,3,0,2,0,0,0,[
str_seg('blue4','Helvetica-BoldOblique',3,80640,116,14,3,0,2,0,0,0,0,0,
"Management VM")])
])
])]).
text('black',480,201,1,1,1,146,17,69770,14,3,2,-4,0,0,2,146,17,0,0,"",0,0,0,0,215,'',[
minilines(146,17,0,0,1,-4,0,[
mini_line(146,14,3,0,0,0,[
str_block(0,146,14,3,0,0,0,0,0,[
str_seg('blue4','Helvetica-Oblique',2,80640,146,14,3,0,0,0,0,0,0,0,
"User Virtual Machines")])
])
])]).
+7 -2
View File
@@ -51,8 +51,13 @@ check-for-zlib:
LINUX_ROOT := $(wildcard $(XEN_ROOT)/linux-2.6.*-xen-sparse)
mk-symlinks:
[ -e xen/linux ] || mkdir -p xen/linux
lndir -silent ../$(XEN_ROOT)/xen/include/public xen
lndir -silent ../../$(LINUX_ROOT)/include/asm-xen/linux-public xen/linux
[ -e xen/io ] || mkdir -p xen/io
( cd xen >/dev/null ; \
ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . )
( cd xen/io >/dev/null ; \
ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . )
( cd xen/linux >/dev/null ; \
ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
install: all
mkdir -p $(prefix)/usr/lib
+3
View File
@@ -8,6 +8,9 @@
#============================================================================
from getopt import getopt
# Default install path for Xen binary packages.
sys.path.append('/lib/python')
from xen.util.Brctl import *
short_options = 'hvqni:b:c'
+4 -1
View File
@@ -22,6 +22,10 @@
import os
import sys
# Default install path for Xen binary packages.
sys.path.append('/lib/python')
from xen.xend.server import SrvDaemon
class CheckError(ValueError):
pass
@@ -93,7 +97,6 @@ def main():
check_user()
except CheckError:
sys.exit(1)
from xen.xend.server import SrvDaemon
daemon = SrvDaemon.instance()
if not sys.argv[1:]:
print 'usage: %s {start|stop|restart}' % sys.argv[0]
+2
View File
@@ -22,6 +22,8 @@ import os
import sys
import re
# Default install path for Xen binary packages.
sys.path.append('/lib/python')
from xen.xend.server.params import XEND_PID_FILE
class CheckError(ValueError):
+3
View File
@@ -1,6 +1,9 @@
#!/usr/bin/env python
# -*- mode: python; -*-
import sys
# Default install path for Xen binary packages.
sys.path.append('/lib/python')
from xen.xm import main
main.main(sys.argv)
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.