[Xen-changelog] Merge.

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

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID c9184cc4d1d15c75aaf50622576587421053bb00
# Parent  8d5d4d58407f7071ee1dc0cc2418ffce508d8c1c
# Parent  ffa8e85a9e0b94fd3a1cc7e81dbdc340bd481757
Merge.

diff -r 8d5d4d58407f -r c9184cc4d1d1 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Thu Dec 22 14:33:19 2005
+++ b/tools/python/xen/xm/main.py       Thu Dec 22 16:15:33 2005
@@ -75,7 +75,7 @@
 vcpu_set_help = """vcpu-set <DomId> <VCPUs>         Set the number of VCPUs 
for a domain"""
 vcpu_list_help = "vcpu-list <DomId>                List the VCPUs for a domain 
(or all domains)"
 vcpu_pin_help = "vcpu-pin <DomId> <VCPU> <CPUs>   Set which cpus a VCPU can 
use" 
-dmesg_help =   "dmesg [--clear]                  Read or clear Xen's message 
buffer"
+dmesg_help =   "dmesg [-c|--clear]               Read or clear Xen's message 
buffer"
 info_help =    "info                             Get information about the xen 
host"
 rename_help =  "rename <DomId> <New Name>        Rename a domain"
 log_help =     "log                              Print the xend log"
@@ -672,7 +672,7 @@
         server.xend_node_clear_dmesg()
 
 def xm_log(args):
-    arg_check(args, 'xm-log', 0)
+    arg_check(args, "log", 0)
     
     from xen.xend.XendClient import server
     print server.xend_node_log()
@@ -845,8 +845,8 @@
     "balloon": "mem-set",
     "set-vcpus": "vcpu-set",
     "vif-list": "network-list",
-    "vbd-create": "block-create",
-    "vbd-destroy": "block-destroy",
+    "vbd-create": "block-attach",
+    "vbd-destroy": "block-detach",
     "vbd-list": "block-list",
     }
 
diff -r 8d5d4d58407f -r c9184cc4d1d1 
linux-2.6-xen-sparse/include/asm-xen/asm-i386/bug.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/bug.h       Thu Dec 22 
14:33:19 2005
+++ /dev/null   Thu Dec 22 16:15:33 2005
@@ -1,16 +0,0 @@
-#ifndef _I386_BUG_H
-#define _I386_BUG_H
-
-#include <linux/config.h>
-
-#define BUG() do { \
-       printk("kernel BUG at %s:%d (%s)!\n", \
-              __FILE__, __LINE__, __FUNCTION__); \
-       dump_stack(); \
-       panic("BUG!"); \
-} while (0)
-#define HAVE_ARCH_BUG
-
-#include <asm-generic/bug.h>
-
-#endif

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