ia64/xen-unstable

changeset 14757:67f4f21f76e9

Merge
author Tim Deegan <Tim.Deegan@xensource.com>
date Thu Apr 05 18:12:35 2007 +0100 (2007-04-05)
parents 3b4de5f415c9 69ab63bee57c
children a00c629f67be
files
line diff
     1.1 --- a/docs/Docs.mk	Thu Apr 05 18:12:21 2007 +0100
     1.2 +++ b/docs/Docs.mk	Thu Apr 05 18:12:35 2007 +0100
     1.3 @@ -6,6 +6,7 @@ LATEX2HTML	:= latex2html
     1.4  DOXYGEN		:= doxygen
     1.5  POD2MAN		:= pod2man
     1.6  DOT		:= dot
     1.7 +NEATO		:= neato
     1.8  
     1.9  pkgdocdir	:= /usr/share/doc/xen
    1.10  mandir		:= /usr/share/man
     2.1 --- a/docs/xen-api/Makefile	Thu Apr 05 18:12:21 2007 +0100
     2.2 +++ b/docs/xen-api/Makefile	Thu Apr 05 18:12:35 2007 +0100
     2.3 @@ -37,6 +37,9 @@ xenapi.dvi: $(TEX) $(EPS) $(EPSDOT)
     2.4  %.eps: %.dot
     2.5  	$(DOT) -Tps $< >$@
     2.6  
     2.7 +xenapi-datamodel-graph.eps: xenapi-datamodel-graph.dot
     2.8 +	$(NEATO) -Goverlap=false -Tps $< >$@
     2.9 +
    2.10  .PHONY: clean
    2.11  clean:
    2.12  	rm -f *.pdf *.ps *.dvi *.aux *.log $(EPSDOT)
     3.1 --- a/docs/xen-api/xenapi-datamodel-graph.dot	Thu Apr 05 18:12:21 2007 +0100
     3.2 +++ b/docs/xen-api/xenapi-datamodel-graph.dot	Thu Apr 05 18:12:35 2007 +0100
     3.3 @@ -1,18 +1,39 @@
     3.4 -digraph g{
     3.5 -node [ shape=box ]; session [ URL="session.html" ] task [ URL="task.html" ] VM [ URL="VM.html" ] host [ URL="host.html" ] host_cpu [ URL="host_cpu.html" ] network [ URL="network.html" ] VIF [ URL="VIF.html" ] PIF [ URL="PIF.html" ] SR [ URL="SR.html" ] VDI [ URL="VDI.html" ] VBD [ URL="VBD.html" ] VTPM [ URL="VTPM.html" ] console [ URL="console.html" ] user [ URL="user.html" ] debug [ URL="debug.html" ];
     3.6 -session -> host [ label="this_host(1)" ]
     3.7 -session -> user [ label="this_user(1)" ]
     3.8 -host -> VM [ color="blue", arrowhead="crow", arrowtail="none" ]
     3.9 -host -> host_cpu [ color="blue", arrowhead="crow", arrowtail="none" ]
    3.10 -VIF -> VM [ color="blue", arrowhead="none", arrowtail="crow" ]
    3.11 -VIF -> network [ color="blue", arrowhead="none", arrowtail="crow" ]
    3.12 -PIF -> host [ color="blue", arrowhead="none", arrowtail="crow" ]
    3.13 -PIF -> network [ color="blue", arrowhead="none", arrowtail="crow" ]
    3.14 -SR -> VDI [ color="blue", arrowhead="crow", arrowtail="none" ]
    3.15 -VDI -> VBD [ color="blue", arrowhead="crow", arrowtail="none" ]
    3.16 -VDI -> VDI [ color="blue", arrowhead="none", arrowtail="crow" ]
    3.17 -VBD -> VM [ color="blue", arrowhead="none", arrowtail="crow" ]
    3.18 -VTPM -> VM [ label="backend(1)" ]
    3.19 -VTPM -> VM [ color="blue", arrowhead="none", arrowtail="crow" ]
    3.20 -console -> VM [ color="blue", arrowhead="none", arrowtail="crow" ]
    3.21 +#
    3.22 +# Copyright (c) 2006-2007 XenSource, Inc.
    3.23 +#
    3.24 +# Permission is granted to copy, distribute and/or modify this document under
    3.25 +# the terms of the GNU Free Documentation License, Version 1.2 or any later
    3.26 +# version published by the Free Software Foundation; with no Invariant
    3.27 +# Sections, no Front-Cover Texts and no Back-Cover Texts.  A copy of the
    3.28 +# license is included in the section entitled
    3.29 +# "GNU Free Documentation License" or the file fdl.tex.
    3.30 +#
    3.31 +
    3.32 +digraph "Xen-API Class Diagram" {
    3.33 +fontname="Verdana";
    3.34 +
    3.35 +node [ shape=box ]; session VM host network VIF PIF SR VDI VBD PBD user;
    3.36 +node [shape=ellipse]; PIF_metrics VIF_metrics VM_metrics VBD_metrics PBD_metrics VM_guest_metrics host_metrics;
    3.37 +node [shape=box]; host_cpu console
    3.38 +session -> host [ arrowhead="none" ]
    3.39 +session -> user [ arrowhead="none" ]
    3.40 +VM -> VM_metrics [ arrowhead="none" ]
    3.41 +VM -> VM_guest_metrics [ arrowhead="none" ]
    3.42 +VM -> console [ arrowhead="crow" ]
    3.43 +host -> PBD [ arrowhead="crow", arrowtail="none" ]
    3.44 +host -> host_metrics [ arrowhead="none" ]
    3.45 +host -> host_cpu [ arrowhead="none" ]
    3.46 +VIF -> VM [ arrowhead="none", arrowtail="crow" ]
    3.47 +VIF -> network [ arrowhead="none", arrowtail="crow" ]
    3.48 +VIF -> VIF_metrics [ arrowhead="none" ]
    3.49 +PIF -> host [ arrowhead="none", arrowtail="crow" ]
    3.50 +PIF -> network [ arrowhead="none", arrowtail="crow" ]
    3.51 +PIF -> PIF_metrics [ arrowhead="none" ]
    3.52 +SR -> PBD [ arrowhead="crow", arrowtail="none" ]
    3.53 +PBD -> PBD_metrics [ arrowhead="none" ]
    3.54 +SR -> VDI [ arrowhead="crow", arrowtail="none" ]
    3.55 +VDI -> VBD [ arrowhead="crow", arrowtail="none" ]
    3.56 +VBD -> VM [ arrowhead="none", arrowtail="crow" ]
    3.57 +VTPM -> VM [ arrowhead="none", arrowtail="crow" ]
    3.58 +VBD -> VBD_metrics [ arrowhead="none" ]
    3.59  }