[PATCH] Fixing bug/typo in main.py

[PATCH] Fixing bug/typo in main.py

[Yoshinori Katase]

[-- Attachment #1: Type: text/plain, Size: 1647 bytes --]

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 <y_katase@soft.fujitsu.com>:
Best Regards,
Yoshinori Katase

diff -r 934470721c46 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Wed Dec 21 19:18:19 2005
+++ b/tools/python/xen/xm/main.py       Thu Dec 22 11:05:02 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",
     }

[-- Attachment #2: main_typo.patch --]
[-- Type: application/octet-stream, Size: 1409 bytes --]

diff -r 934470721c46 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py	Wed Dec 21 19:18:19 2005
+++ b/tools/python/xen/xm/main.py	Thu Dec 22 11:17:01 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",
     }
 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: [PATCH] Fixing bug/typo in main.py

[Ewan Mellor]

On Thu, Dec 22, 2005 at 01:10:43PM +0900, Yoshinori Katase wrote:

> 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 <y_katase@soft.fujitsu.com>:
> Best Regards,
> Yoshinori Katase

Thank you.  I've applied that.

Ewan.

[PATCH] Fixing bug/typo in main.py

[Yoshinori Katase]

[-- Attachment #1: Type: text/plain, Size: 1357 bytes --]

This patch fixes a typo of main.py.
1.xm reboot help is shown only 3 arguments.
2.unit name of Mem in xm list header is *MiB*

Signed-off-by: Yoshinori Katase <y_katase@soft.fujitsu.com>
Best Regards,
Yoshinori Katase

diff -r ed7888c838ad tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Tue Jan 10 17:53:44 2006
+++ b/tools/python/xen/xm/main.py       Wed Jan 11 16:05:28 2006
@@ -58,7 +58,7 @@
 mem_set_help = "mem-set <DomId> <Mem>            Adjust the current memory
usage for a domain"
 migrate_help = "migrate <DomId> <Host>           Migrate a domain to
another machine"
 pause_help =   "pause <DomId>                    Pause execution of a
domain"
-reboot_help =  "reboot <DomId> [-w][-a]          Reboot a domain"
+reboot_help =  "reboot <DomId> [-w][-a][-R|-H]   Reboot a domain"
 restore_help = "restore <File>                   Create a domain from a
saved state file"
 save_help =    "save <DomId> <File>              Save domain state (and
config) to file"
 shutdown_help ="shutdown <DomId> [-w][-a][-R|-H] Shutdown a domain"
@@ -377,7 +377,7 @@


 def xm_brief_list(doms):
-    print 'Name                              ID Mem(MiB) VCPUs State
Time(s)'
+    print 'Name                              ID  Mem(MB) VCPUs State
Time(s)'
     for dom in doms:
         d = parse_doms_info(dom)
         if (d['ssidref'] != 0):

[-- Attachment #2: main_typo.patch --]
[-- Type: application/octet-stream, Size: 1151 bytes --]

diff -r ed7888c838ad tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py	Tue Jan 10 17:53:44 2006
+++ b/tools/python/xen/xm/main.py	Wed Jan 11 16:10:43 2006
@@ -58,7 +58,7 @@
 mem_set_help = "mem-set <DomId> <Mem>            Adjust the current memory usage for a domain"
 migrate_help = "migrate <DomId> <Host>           Migrate a domain to another machine"
 pause_help =   "pause <DomId>                    Pause execution of a domain"
-reboot_help =  "reboot <DomId> [-w][-a]          Reboot a domain"
+reboot_help =  "reboot <DomId> [-w][-a][-R|-H]   Reboot a domain"
 restore_help = "restore <File>                   Create a domain from a saved state file"
 save_help =    "save <DomId> <File>              Save domain state (and config) to file"
 shutdown_help ="shutdown <DomId> [-w][-a][-R|-H] Shutdown a domain"
@@ -377,7 +377,7 @@
 
 
 def xm_brief_list(doms):
-    print 'Name                              ID Mem(MiB) VCPUs State  Time(s)'
+    print 'Name                              ID  Mem(MB) VCPUs State  Time(s)'
     for dom in doms:
         d = parse_doms_info(dom)
         if (d['ssidref'] != 0):

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: [PATCH] Fixing bug/typo in main.py

[Thomas Schwinge]

On Wed, Jan 11, 2006 at 04:21:21PM +0900, Yoshinori Katase wrote:
> This patch fixes a typo of main.py.
> [...]
> 2.unit name of Mem in xm list header is *MiB*

>  def xm_brief_list(doms):
> -    print 'Name                              ID Mem(MiB) VCPUs State
> Time(s)'
> +    print 'Name                              ID  Mem(MB) VCPUs State
> Time(s)'

`MiB' is correct, see
<URL:http://physics.nist.gov/cuu/Units/binary.html>.


Regards,
 Thomas

Re: [PATCH] Fixing bug/typo in main.py

[Ewan Mellor]

On Wed, Jan 11, 2006 at 04:21:21PM +0900, Yoshinori Katase wrote:

> This patch fixes a typo of main.py.
> 1.xm reboot help is shown only 3 arguments.

What you've done here isn't right.  xm reboot is redirected through xm
shutdown, but that's just a messy implementation detail.  xm shutdown -H means
shutdown and don't restart regardless of configuration to the contrary -- xm
reboot -H therefore does not make any sense.  xm shutdown -R is exactly the
same as xm reboot, and so xm reboot -R does not make any sense either.

We ought to change the arg_check for xm_reboot to allow a maximum of 3
arguments, but better would be to rewrite shutdown.py so that the handling of
the call to the server was separate from the argument handling and this mess
was sorted out properly.  Any volunteers?

Thanks,

Ewan.