From 7fae73c67e5254f3acf1e0b1d096f861ea50be54 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Thu, 22 Dec 2005 15:50:06 +0100 Subject: [PATCH 1/2] Remove xen specific bug() implementation -- the regular one works just fine. From: "Jan Beulich" Signed-off-by: Christian Limpach --- .../include/asm-xen/asm-i386/bug.h | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 linux-2.6-xen-sparse/include/asm-xen/asm-i386/bug.h diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/bug.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/bug.h deleted file mode 100644 index db60354ff8..0000000000 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/bug.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _I386_BUG_H -#define _I386_BUG_H - -#include - -#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 - -#endif From 27efc4fd12537ed2c97007c7b84865f5f33bc8af Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Thu, 22 Dec 2005 15:38:10 +0000 Subject: [PATCH 2/2] This patch fixes a bug/typo of main.py. 1. show option "-c" of help of xm dmesg 2. fix value of parameter of arg_check of xm log 3. fix aliases of vbd-create and vbd-destroy Signed-off-by Yoshinori Katase --- tools/python/xen/xm/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index ad69090464..56f7ce385c 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -75,7 +75,7 @@ domname_help = "domname Convert a domain id to a domain vcpu_set_help = """vcpu-set Set the number of VCPUs for a domain""" vcpu_list_help = "vcpu-list List the VCPUs for a domain (or all domains)" vcpu_pin_help = "vcpu-pin 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 Rename a domain" log_help = "log Print the xend log" @@ -672,7 +672,7 @@ its contents if the [-c|--clear] flag is specified. 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 @@ aliases = { "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", }