[Xen-changelog] merge?

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID e24fd7012ffb9783a29990a69b922ebf104e3a82
# Parent  2f20c2fce2c50dc4a01bff6855b90eb66a5b5a78
# Parent  fd77dd32c8a4e4e222ccee984b004b20be3b839c
merge?

diff -r 2f20c2fce2c5 -r e24fd7012ffb tools/examples/README
--- a/tools/examples/README     Thu Aug 25 00:55:20 2005
+++ b/tools/examples/README     Thu Aug 25 10:09:39 2005
@@ -9,9 +9,20 @@
 send it (preferably with a little summary to go in this file) to
 <xen-devel@xxxxxxxxxxxxxxxxxxxxx> so we can add it to this directory.
 
+block-enbd          - binds/unbinds network block devices
+block-file          - binds/unbinds file to loopback device
+mem-map.sxp         - memory map xend configuration file.
 network             - default network setup script called by xend at startup.
+network-route       - default xen network start/stop script.
+network-nat         - default xen network start/stop script when using NAT.
 vif-bridge          - default virtual network interface setup script.
+vif-route           - default xen virtual network start/stop script
+vif-nat             - configures vif in routed-nat mode.
 xend-config.sxp     - default xend configuration file.
 xmexample1          - example configuration script for 'xm create'.
 xmexample2          - a more complex configuration script for 'xm create'.
+xmexample3          - an advanced configuration script for 'xm create' 
+                      that utilizes the vmid.
+xmexample.vmx       - a configuration script for creating a vmx domain with
+                      'xm create'.
 
diff -r 2f20c2fce2c5 -r e24fd7012ffb tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Thu Aug 25 00:55:20 2005
+++ b/tools/python/xen/xm/main.py       Thu Aug 25 10:09:39 2005
@@ -665,8 +665,10 @@
             err("Most commands need root access.  Please try again as root")
             sys.exit(1)
         except XendError, ex:
+            if args[0] == "bogus":
+                args.remove("bogus")
             if len(args) > 0:
-                handle_xend_error(argv[1], args[1], ex)
+                handle_xend_error(argv[1], args[0], ex)
             else:
                 print "Unexpected error:", sys.exc_info()[0]
                 print
diff -r 2f20c2fce2c5 -r e24fd7012ffb xen/arch/x86/cpu/amd.c
--- a/xen/arch/x86/cpu/amd.c    Thu Aug 25 00:55:20 2005
+++ b/xen/arch/x86/cpu/amd.c    Thu Aug 25 10:09:39 2005
@@ -39,7 +39,7 @@
  */
  
 extern void vide(void);
-__asm__(".align 4\nvide: ret");
+__asm__(".text\n.align 4\nvide: ret");
 
 static void __init init_amd(struct cpuinfo_x86 *c)
 {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog