ia64/xen-unstable

changeset 8444:c9184cc4d1d1

Merge.
author Ian.Campbell@xensource.com
date Thu Dec 22 16:15:33 2005 +0000 (2005-12-22)
parents 8d5d4d58407f ffa8e85a9e0b
children 87e5ac90a8df f3d2e3659786
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/bug.h	Thu Dec 22 14:33:19 2005 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,16 +0,0 @@
     1.4 -#ifndef _I386_BUG_H
     1.5 -#define _I386_BUG_H
     1.6 -
     1.7 -#include <linux/config.h>
     1.8 -
     1.9 -#define BUG() do { \
    1.10 -	printk("kernel BUG at %s:%d (%s)!\n", \
    1.11 -	       __FILE__, __LINE__, __FUNCTION__); \
    1.12 -	dump_stack(); \
    1.13 -	panic("BUG!"); \
    1.14 -} while (0)
    1.15 -#define HAVE_ARCH_BUG
    1.16 -
    1.17 -#include <asm-generic/bug.h>
    1.18 -
    1.19 -#endif
     2.1 --- a/tools/python/xen/xm/main.py	Thu Dec 22 14:33:19 2005 +0000
     2.2 +++ b/tools/python/xen/xm/main.py	Thu Dec 22 16:15:33 2005 +0000
     2.3 @@ -75,7 +75,7 @@ domname_help = "domname <DomId>         
     2.4  vcpu_set_help = """vcpu-set <DomId> <VCPUs>         Set the number of VCPUs for a domain"""
     2.5  vcpu_list_help = "vcpu-list <DomId>                List the VCPUs for a domain (or all domains)"
     2.6  vcpu_pin_help = "vcpu-pin <DomId> <VCPU> <CPUs>   Set which cpus a VCPU can use" 
     2.7 -dmesg_help =   "dmesg [--clear]                  Read or clear Xen's message buffer"
     2.8 +dmesg_help =   "dmesg [-c|--clear]               Read or clear Xen's message buffer"
     2.9  info_help =    "info                             Get information about the xen host"
    2.10  rename_help =  "rename <DomId> <New Name>        Rename a domain"
    2.11  log_help =     "log                              Print the xend log"
    2.12 @@ -672,7 +672,7 @@ its contents if the [-c|--clear] flag is
    2.13          server.xend_node_clear_dmesg()
    2.14  
    2.15  def xm_log(args):
    2.16 -    arg_check(args, 'xm-log', 0)
    2.17 +    arg_check(args, "log", 0)
    2.18      
    2.19      from xen.xend.XendClient import server
    2.20      print server.xend_node_log()
    2.21 @@ -845,8 +845,8 @@ aliases = {
    2.22      "balloon": "mem-set",
    2.23      "set-vcpus": "vcpu-set",
    2.24      "vif-list": "network-list",
    2.25 -    "vbd-create": "block-create",
    2.26 -    "vbd-destroy": "block-destroy",
    2.27 +    "vbd-create": "block-attach",
    2.28 +    "vbd-destroy": "block-detach",
    2.29      "vbd-list": "block-list",
    2.30      }
    2.31