This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-changelog] [xen-unstable] xend: Fix error message for xm trigger co

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] xend: Fix error message for xm trigger command.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 07 Sep 2007 09:14:02 -0700
Delivery-date: Fri, 07 Sep 2007 09:22:31 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1189160668 -3600
# Node ID 7dba4441bf922e4d810580bcbc750e09ee50c14e
# Parent  f2bc66154ba99f02cbc27bfb9205838673e78cf9
xend: Fix error message for xm trigger command.

When I tested xm trigger command with a wrong argument, I saw the
following error message.

 # xm trigger vm1 xyz
 Error: __init__() takes exactly 2 arguments (3 given)
 Usage: xm trigger <Domain> <nmi|reset|init> [<VCPU>]

 Send a trigger to a domain.

This patch fixes the error message as follows.

 # xm trigger vm1 xyz
 Error: Invalid trigger: xyz
 Usage: xm trigger <Domain> <nmi|reset|init> [<VCPU>]

 Send a trigger to a domain.

The type of "TRIGGER_TYPE" is dictionary.  domain_send_trigger()
refers to the keys of "TRIGGER_TYPE" without using keys() currently.
This patch adds keys() there.

Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
 tools/python/xen/xend/XendDomain.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r f2bc66154ba9 -r 7dba4441bf92 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       Fri Sep 07 11:10:32 2007 +0100
+++ b/tools/python/xen/xend/XendDomain.py       Fri Sep 07 11:24:28 2007 +0100
@@ -1594,10 +1594,10 @@ class XendDomain:
             raise VMBadState("Domain '%s' is not started" % domid,
-        if trigger_name.lower() in TRIGGER_TYPE: 
+        if trigger_name.lower() in TRIGGER_TYPE.keys(): 
             trigger = TRIGGER_TYPE[trigger_name.lower()]
-            raise XendError("Invalid trigger: %s", trigger_name)
+            raise XendError("Invalid trigger: %s" % trigger_name)
             return xc.domain_send_trigger(dominfo.getDomid(),

Xen-changelog mailing list

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] xend: Fix error message for xm trigger command., Xen patchbot-unstable <=