diff --git a/tools/python/xen/sv/DomInfo.py b/tools/python/xen/sv/DomInfo.py index 12135cd4fb..89feca01a5 100755 --- a/tools/python/xen/sv/DomInfo.py +++ b/tools/python/xen/sv/DomInfo.py @@ -139,7 +139,7 @@ class DomActionTab( ActionTab ): if not dom is None and dom != '0': if DEBUG: print ">DomShutDown %s" % dom try: - server.xend_domain_shutdown( int( dom ), "halt" ) + server.xend_domain_shutdown( int( dom ), "poweroff" ) except: pass @@ -175,7 +175,7 @@ class DomActionTab( ActionTab ): if not dom is None and dom != '0': if DEBUG: print ">DomDestroy %s" % dom try: - server.xend_domain_destroy( int( dom ), "halt" ) + server.xend_domain_destroy(int( dom )) except: pass diff --git a/tools/python/xen/xend/XendClient.py b/tools/python/xen/xend/XendClient.py index e0b4babc49..0919ae6da6 100644 --- a/tools/python/xen/xend/XendClient.py +++ b/tools/python/xen/xend/XendClient.py @@ -232,10 +232,9 @@ class Xend: {'op' : 'sysrq', 'key' : key}) - def xend_domain_destroy(self, id, reason): + def xend_domain_destroy(self, id): return self.xendPost(self.domainurl(id), - {'op' : 'destroy', - 'reason' : reason }) + {'op' : 'destroy' }) def xend_domain_save(self, id, filename): return self.xendPost(self.domainurl(id), diff --git a/tools/python/xen/xend/server/SrvDomain.py b/tools/python/xen/xend/server/SrvDomain.py index 896f5b4003..6b9cb7b202 100644 --- a/tools/python/xen/xend/server/SrvDomain.py +++ b/tools/python/xen/xend/server/SrvDomain.py @@ -71,8 +71,7 @@ class SrvDomain(SrvDir): def op_destroy(self, op, req): fn = FormFn(self.xd.domain_destroy, - [['dom', 'int'], - ['reason', 'str']]) + [['dom', 'int']]) val = fn(req.args, {'dom': self.dom.domid}) req.setHeader("Location", "%s/.." % req.prePathURL()) return val @@ -232,8 +231,6 @@ class SrvDomain(SrvDir): req.write('
' % url) req.write('') - req.write('Halt') - req.write('Reboot') req.write('
') req.write('
' % url) diff --git a/tools/python/xen/xm/destroy.py b/tools/python/xen/xm/destroy.py index 66977be871..345b04a1d7 100644 --- a/tools/python/xen/xm/destroy.py +++ b/tools/python/xen/xm/destroy.py @@ -21,19 +21,15 @@ from xen.xend.XendClient import server from xen.xm.opts import * -gopts = Opts(use="""[options] [DOM] +gopts = Opts(use="""[DOM] -Destroy a domain, optionally restarting it. +Destroy a domain. """) gopts.opt('help', short='h', fn=set_true, default=0, use="Print this help.") -gopts.opt('reboot', short='R', - fn=set_true, default=0, - use='Destroy and restart.') - def main(argv): opts = gopts args = opts.parse(argv) @@ -42,10 +38,4 @@ def main(argv): return if len(args) < 1: opts.err('Missing domain') dom = args[0] - if opts.vals.reboot: - mode = 'reboot' - else: - mode = 'halt' - server.xend_domain_destroy(dom, mode) - - + server.xend_domain_destroy(dom) diff --git a/tools/python/xen/xm/shutdown.py b/tools/python/xen/xm/shutdown.py index e814f03f56..7f626838bc 100644 --- a/tools/python/xen/xm/shutdown.py +++ b/tools/python/xen/xm/shutdown.py @@ -73,19 +73,15 @@ def shutdown(opts, doms, mode, wait): opts.info("All domains terminated") def shutdown_mode(opts): - mode = 'poweroff' - if opts.vals.wait: - mode = 'halt' - if opts.vals.reboot: - opts.err("Can't specify wait and reboot") + if opts.vals.halt and opts.vals.reboot: + opts.err("Can't specify halt and reboot") + + if opts.vals.halt: + return 'halt' + elif opts.vals.reboot: + return 'reboot' else: - if opts.vals.halt and opts.vals.reboot: - opts.err("Can't specify halt and reboot") - if opts.vals.halt: - mode = 'halt' - elif opts.vals.reboot: - mode = 'reboot' - return mode + return 'poweroff' def main_all(opts, args): mode = shutdown_mode(opts)