38.1 --- a/tools/examples/README	Thu Aug 25 00:55:20 2005 +0000
    38.2 +++ b/tools/examples/README	Thu Aug 25 10:09:39 2005 +0000
    38.3 @@ -9,9 +9,20 @@ If you write a useful script and would l
    38.4  send it (preferably with a little summary to go in this file) to
    38.5  <xen-devel@lists.sourceforge.net> so we can add it to this directory.
    38.6  
    38.7 +block-enbd          - binds/unbinds network block devices
    38.8 +block-file          - binds/unbinds file to loopback device
    38.9 +mem-map.sxp         - memory map xend configuration file.
   38.10  network             - default network setup script called by xend at startup.
   38.11 +network-route       - default xen network start/stop script.
   38.12 +network-nat         - default xen network start/stop script when using NAT.
   38.13  vif-bridge          - default virtual network interface setup script.
   38.14 +vif-route           - default xen virtual network start/stop script
   38.15 +vif-nat             - configures vif in routed-nat mode.
   38.16  xend-config.sxp     - default xend configuration file.
   38.17  xmexample1          - example configuration script for 'xm create'.
   38.18  xmexample2          - a more complex configuration script for 'xm create'.
   38.19 +xmexample3          - an advanced configuration script for 'xm create' 
   38.20 +                      that utilizes the vmid.
   38.21 +xmexample.vmx       - a configuration script for creating a vmx domain with
   38.22 +                      'xm create'.
   38.23  

    71.1 --- a/tools/python/xen/xm/main.py	Thu Aug 25 00:55:20 2005 +0000
    71.2 +++ b/tools/python/xen/xm/main.py	Thu Aug 25 10:09:39 2005 +0000
    71.3 @@ -665,8 +665,10 @@ def main(argv=sys.argv):
    71.4              err("Most commands need root access.  Please try again as root")
    71.5              sys.exit(1)
    71.6          except XendError, ex:
    71.7 +            if args[0] == "bogus":
    71.8 +                args.remove("bogus")
    71.9              if len(args) > 0:
   71.10 -                handle_xend_error(argv[1], args[1], ex)
   71.11 +                handle_xend_error(argv[1], args[0], ex)
   71.12              else:
   71.13                  print "Unexpected error:", sys.exc_info()[0]
   71.14                  print

    84.1 --- a/xen/arch/x86/cpu/amd.c	Thu Aug 25 00:55:20 2005 +0000
    84.2 +++ b/xen/arch/x86/cpu/amd.c	Thu Aug 25 10:09:39 2005 +0000
    84.3 @@ -39,7 +39,7 @@ custom_param("amd_flush_filter", flush_f
    84.4   */
    84.5   
    84.6  extern void vide(void);
    84.7 -__asm__(".align 4\nvide: ret");
    84.8 +__asm__(".text\n.align 4\nvide: ret");
    84.9  
   84.10  static void __init init_amd(struct cpuinfo_x86 *c)
   84.11  {