[Xen-changelog] [xen-unstable] xm, xenapi: Fix a problem in xm client for domain shutdown

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217406191 -3600
# Node ID bd9823ec7097458e33a264309be975260de7fe2a
# Parent  4160bc28f0fbaa51321226c33f50732796942bc6
xm, xenapi: Fix a problem in xm client for domain shutdown

Xm did not shut down domains anymore when run in xen-api mode due to a
'None' parameter being passed to xend when looking up a domain. This
fixes the problem.

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 tools/python/xen/xm/shutdown.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r 4160bc28f0fb -r bd9823ec7097 tools/python/xen/xm/shutdown.py
--- a/tools/python/xen/xm/shutdown.py   Wed Jul 30 09:22:24 2008 +0100
+++ b/tools/python/xen/xm/shutdown.py   Wed Jul 30 09:23:11 2008 +0100
@@ -144,9 +144,10 @@ def main_dom(opts, args):
 def main_dom(opts, args):
     if len(args) == 0: opts.err('No domain parameter given')
     if len(args) >  1: opts.err('No multiple domain parameters allowed')
-    dom = sxp.child_value(server.xend.domain(args[0]), 'name')
     if serverType == SERVER_XEN_API:
-        dom = get_single_vm(dom)
+        dom = get_single_vm(args[0])
+    else:
+        dom = sxp.child_value(server.xend.domain(args[0]), 'name')
     mode = shutdown_mode(opts)  
     shutdown(opts, [ dom ], mode, opts.vals.wait)
     

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