1.1 --- a/docs/man/xmdomain.cfg.pod.5	Tue Nov 01 15:57:19 2005 +0100
     1.2 +++ b/docs/man/xmdomain.cfg.pod.5	Tue Nov 01 16:02:43 2005 +0100
     1.3 @@ -72,6 +72,57 @@ A bare minimal config file example might
     1.4  
     1.5  =item I<builder>
     1.6  
     1.7 +=back 
     1.8 +
     1.9 +=head1 DOMAIN SHUTDOWN OPTIONS
    1.10 +
    1.11 +There are 3 options which control domain shutdown (both planned and
    1.12 +unplanned) under certain events.  The 3 events currently captured are:
    1.13 +
    1.14 +=over 4
    1.15 +
    1.16 +=item I<shutdown>
    1.17 +
    1.18 +Triggered on either an I<xm shutdown> or graceful shutdown from inside
    1.19 +the DomU.
    1.20 +
    1.21 +=item I<reboot>
    1.22 +
    1.23 +Triggered on either an I<xm reboot> or graceful reboot from inside the
    1.24 +DomU.
    1.25 +
    1.26 +=item I<crash>
    1.27 +
    1.28 +Triggered when a DomU goes to the crashed state for any reason.
    1.29 +
    1.30 +=back
    1.31 +
    1.32 +All of them take one of 4 valid states listed below.  
    1.33 +
    1.34 +=over 4
    1.35 +
    1.36 +=item I<destroy>
    1.37 +
    1.38 +The domain will be cleaned up completely.  No attempt at respawning
    1.39 +will occur.  This is what a typical shutdown would look like.
    1.40 +
    1.41 +=item I<restart>
    1.42 +
    1.43 +The domain will be restarted with the same name as the old domain.
    1.44 +This is what a typical reboot would look like.
    1.45 +
    1.46 +=item I<preserve>
    1.47 +
    1.48 +The domain will not be cleaned up at all.  This is often useful for
    1.49 +crash state domains which ensures that enough evidence is to debug the
    1.50 +real issue.
    1.51 +
    1.52 +=item I<rename-restart>
    1.53 +
    1.54 +The old domain will not be cleaned up, but will be renamed so a new
    1.55 +domain can be restarted in it's place.  (TODO: what does this mean for
    1.56 +resources?  What is the renamed name?)
    1.57 +
    1.58  =back
    1.59  
    1.60  =head1 SEE ALSO

     2.1 --- a/docs/src/user/control_software.tex	Tue Nov 01 15:57:19 2005 +0100
     2.2 +++ b/docs/src/user/control_software.tex	Tue Nov 01 16:02:43 2005 +0100
     2.3 @@ -60,7 +60,7 @@ custom variables (for instance, the \pat
     2.4  The available commands are as follows:
     2.5  
     2.6  \begin{description}
     2.7 -\item[set-mem] Request a domain to adjust its memory footprint.
     2.8 +\item[mem-set] Request a domain to adjust its memory footprint.
     2.9  \item[create] Create a new domain.
    2.10  \item[destroy] Kill a domain immediately.
    2.11  \item[list] List running domains.

     3.1 --- a/docs/src/user/domain_mgmt.tex	Tue Nov 01 15:57:19 2005 +0100
     3.2 +++ b/docs/src/user/domain_mgmt.tex	Tue Nov 01 16:02:43 2005 +0100
     3.3 @@ -160,12 +160,12 @@ memory at the request of the administrat
     3.4  \subsection{Setting memory footprints from dom0}
     3.5  
     3.6  The machine administrator can request that a domain alter its memory
     3.7 -footprint using the \path{xm set-mem} command.  For instance, we can
     3.8 +footprint using the \path{xm mem-set} command.  For instance, we can
     3.9  request that our example ttylinux domain reduce its memory footprint
    3.10  to 32 megabytes.
    3.11  
    3.12  \begin{verbatim}
    3.13 -# xm set-mem ttylinux 32
    3.14 +# xm mem-set ttylinux 32
    3.15  \end{verbatim}
    3.16  
    3.17  We can now see the result of this in the output of \path{xm list}:
    3.18 @@ -181,7 +181,7 @@ The domain has responded to the request 
    3.19  can restore the domain to its original size using the command line:
    3.20  
    3.21  \begin{verbatim}
    3.22 -# xm set-mem ttylinux 64
    3.23 +# xm mem-set ttylinux 64
    3.24  \end{verbatim}
    3.25  
    3.26  \subsection{Setting memory footprints from within a domain}

     4.1 --- a/tools/firmware/rombios/rombios.c	Tue Nov 01 15:57:19 2005 +0100
     4.2 +++ b/tools/firmware/rombios/rombios.c	Tue Nov 01 16:02:43 2005 +0100
     4.3 @@ -149,7 +149,7 @@
     4.4  #define BX_SUPPORT_FLOPPY 1
     4.5  #define BX_FLOPPY_ON_CNT 37   /* 2 seconds */
     4.6  #define BX_PCIBIOS       1
     4.7 -#define BX_APM           1
     4.8 +#define BX_APM           0
     4.9  
    4.10  #define BX_USE_ATADRV    1
    4.11  #define BX_ELTORITO_BOOT 1

     5.1 --- a/tools/python/xen/xm/create.py	Tue Nov 01 15:57:19 2005 +0100
     5.2 +++ b/tools/python/xen/xm/create.py	Tue Nov 01 16:02:43 2005 +0100
     5.3 @@ -376,7 +376,7 @@ gopts.var('sdl', val='',
     5.4            use="""Should the device model use SDL?""")
     5.5  
     5.6  gopts.var('display', val='DISPLAY',
     5.7 -          fn=set_value, default='localhost:0',
     5.8 +          fn=set_value, default=None,
     5.9            use="X11 display to use")
    5.10  
    5.11  

     6.1 --- a/tools/xenstat/libxenstat/src/xenstat.c	Tue Nov 01 15:57:19 2005 +0100
     6.2 +++ b/tools/xenstat/libxenstat/src/xenstat.c	Tue Nov 01 16:02:43 2005 +0100
     6.3 @@ -704,7 +704,6 @@ static char *xenstat_get_domain_name(xen
     6.4  {
     6.5  	char path[80];
     6.6  	char *name;
     6.7 -	unsigned int *len;
     6.8  	struct xs_transaction_handle *xstranshandle;
     6.9  
    6.10  	snprintf(path, sizeof(path),"/local/domain/%i/name", domain_id);
    6.11 @@ -715,7 +714,7 @@ static char *xenstat_get_domain_name(xen
    6.12  		exit(1); /* Change this */
    6.13  	}
    6.14  
    6.15 -	name = (char *) xs_read(handle->xshandle, xstranshandle, path, len);
    6.16 +	name = (char *) xs_read(handle->xshandle, xstranshandle, path, NULL);
    6.17  	
    6.18  	xs_transaction_end(handle->xshandle, xstranshandle, false);
    6.19  

     7.1 --- a/xen/common/trace.c	Tue Nov 01 15:57:19 2005 +0100
     7.2 +++ b/xen/common/trace.c	Tue Nov 01 16:02:43 2005 +0100
     7.3 @@ -260,7 +260,7 @@ void trace(u32 event, unsigned long d1, 
     7.4      }
     7.5  
     7.6      rec = &t_recs[smp_processor_id()][buf->prod % nr_recs];
     7.7 -    rdtscll(rec->cycles);
     7.8 +    rec->cycles  = (u64)get_cycles();
     7.9      rec->event   = event;
    7.10      rec->data[0] = d1;
    7.11      rec->data[1] = d2;

     8.1 --- a/xen/include/asm-x86/time.h	Tue Nov 01 15:57:19 2005 +0100
     8.2 +++ b/xen/include/asm-x86/time.h	Tue Nov 01 16:02:43 2005 +0100
     8.3 @@ -2,6 +2,8 @@
     8.4  #ifndef __X86_TIME_H__
     8.5  #define __X86_TIME_H__
     8.6  
     8.7 +#include <asm/msr.h>
     8.8 +
     8.9  extern int timer_ack;
    8.10  
    8.11  extern void calibrate_tsc_bp(void);
    8.12 @@ -10,4 +12,13 @@ extern void calibrate_tsc_ap(void);
    8.13  struct domain;
    8.14  extern void init_domain_time(struct domain *d);
    8.15  
    8.16 +typedef u64 cycles_t;
    8.17 +
    8.18 +static inline cycles_t get_cycles(void)
    8.19 +{
    8.20 +    cycles_t c;
    8.21 +    rdtscll(c);
    8.22 +    return c;
    8.23 +}
    8.24 +
    8.25  #endif /* __X86_TIME_H__ */