ia64/xen-unstable

changeset 2491:d6967bb2c926

bitkeeper revision 1.1159.1.159 (4149ad5eeJbVAMvhnQ8f-lEEF57SLA)

Merge ssh://srg//auto/groups/xeno/BK/xeno-unstable.bk
into equilibrium.research:/export/scratch/xeno-xendomains.bk
author mwilli2@equilibrium.research
date Thu Sep 16 15:12:30 2004 +0000 (2004-09-16)
parents d8a023aa1466 1074e16e2c36
children 5a20652b7d87
files tools/python/xen/sv/CreateDomain.py tools/python/xen/sv/DomList.py tools/python/xen/sv/Main.py
line diff
     1.1 --- a/tools/python/xen/sv/CreateDomain.py	Thu Sep 16 13:11:34 2004 +0000
     1.2 +++ b/tools/python/xen/sv/CreateDomain.py	Thu Sep 16 15:12:30 2004 +0000
     1.3 @@ -113,6 +113,7 @@ class CreateFinish( Sheet ):
     1.4          
     1.5          vals.name = 	get( 'name' )
     1.6          vals.memory = 	get( 'memory' )
     1.7 +        vals.maxmem =   get( 'maxmem' )
     1.8          vals.cpu =  	get( 'cpu' )
     1.9          vals.cpu_weight = get( 'cpu_weight' )
    1.10          
     2.1 --- a/tools/python/xen/sv/DomList.py	Thu Sep 16 13:11:34 2004 +0000
     2.2 +++ b/tools/python/xen/sv/DomList.py	Thu Sep 16 15:12:30 2004 +0000
     2.3 @@ -63,11 +63,11 @@ class DomList( HTMLBase ):
     2.4              request.write( "<td class='domainInfo' align='center'>" )
     2.5              
     2.6              if domInfoHash[ 'state' ][ 2 ] == "-":
     2.7 -                request.write( "<img src='images/small-pause.png' onclick='doOp2( \"pause\", \"%(dom)-4d\" )'>" % domInfoHash )
     2.8 +                request.write( "<img src='images/small-pause.png' onclick='doOp2( \"pause\", \"%(dom)-4s\" )'>" % domInfoHash )
     2.9              else:
    2.10 -                request.write( "<img src='images/small-unpause.png' onclick='doOp2( \"unpause\", \"%(dom)-4d\" )'>" % domInfoHash )              
    2.11 +                request.write( "<img src='images/small-unpause.png' onclick='doOp2( \"unpause\", \"%(dom)-4s\" )'>" % domInfoHash )              
    2.12              
    2.13 -            request.write( "<img src='images/small-destroy.png' onclick='doOp2( \"destroy\", \"%(dom)-4d\" )'></td>" % domInfoHash)
    2.14 +            request.write( "<img src='images/small-destroy.png' onclick='doOp2( \"destroy\", \"%(dom)-4s\" )'></td>" % domInfoHash)
    2.15          else:
    2.16              request.write( "<td>&nbsp;</td>" )
    2.17  
     3.1 --- a/tools/python/xen/sv/Main.py	Thu Sep 16 13:11:34 2004 +0000
     3.2 +++ b/tools/python/xen/sv/Main.py	Thu Sep 16 15:12:30 2004 +0000
     3.3 @@ -88,16 +88,16 @@ class Main( HTMLBase ):
     3.4          
     3.5                  
     3.6      def op_destroy( self, request ):
     3.7 -    	dom = getVar( 'args', request )
     3.8 +    	dom = getVar( 'dom', request )
     3.9          if not dom is None and dom != "0":
    3.10              server.xend_domain_destroy( int( dom ), "halt" ) 
    3.11                   
    3.12      def op_pause( self, request ):
    3.13 -    	dom = getVar( 'args', request )
    3.14 +    	dom = getVar( 'dom', request )
    3.15          if not dom is None and dom != "0":
    3.16              server.xend_domain_pause( int( dom ) )      
    3.17      
    3.18      def op_unpause( self, request ):
    3.19 -    	dom = getVar( 'args', request )
    3.20 +    	dom = getVar( 'dom', request )
    3.21          if not dom is None and dom != "0":
    3.22 -            server.xend_domain_unpause( int( dom ) )      
    3.23 \ No newline at end of file
    3.24 +            server.xend_domain_unpause( int( dom ) )