ia64/xen-unstable

changeset 7848:592d8f74d23d

merge.
author kaf24@firebug.cl.cam.ac.uk
date Wed Nov 16 11:33:13 2005 +0100 (2005-11-16)
parents 2e0700008a87 5019c8d034c4
children 9f4efb238f5b
files
line diff
     1.1 --- a/docs/man/xm.pod.1	Wed Nov 16 11:32:19 2005 +0100
     1.2 +++ b/docs/man/xm.pod.1	Wed Nov 16 11:33:13 2005 +0100
     1.3 @@ -645,10 +645,6 @@ I<[mac=macaddr]> I<[bridge=bridge-name]>
     1.4  
     1.5  =item B<network-detach> I<domain-id> I<devid>
     1.6  
     1.7 -=item B<network-limit> I<domain-id> I<vif> I<credit> I<period>
     1.8 -
     1.9 -Limit the transmission rate of a virtual network interface.
    1.10 -
    1.11  =item B<network-list> I<domain-id>
    1.12  
    1.13  List virtual network interfaces for a domain.  The returned output is
     2.1 --- a/tools/python/xen/xend/XendClient.py	Wed Nov 16 11:32:19 2005 +0100
     2.2 +++ b/tools/python/xen/xend/XendClient.py	Wed Nov 16 11:33:13 2005 +0100
     2.3 @@ -302,13 +302,6 @@ class Xend:
     2.4                              {'op'    : 'set_vcpus',
     2.5                               'vcpus' : vcpus })
     2.6  
     2.7 -    def xend_domain_vif_limit(self, id, vif, credit, period):
     2.8 -        return self.xendPost(self.domainurl(id),
     2.9 -                            { 'op'      : 'vif_limit_set',
    2.10 -                              'vif'     : vif,
    2.11 -                              'credit'  : credit,
    2.12 -                              'period'  : period })
    2.13 -
    2.14      def xend_domain_devices(self, id, type):
    2.15          return self.xendPost(self.domainurl(id),
    2.16                               {'op'      : 'devices',
     3.1 --- a/tools/python/xen/xend/XendDomain.py	Wed Nov 16 11:32:19 2005 +0100
     3.2 +++ b/tools/python/xen/xend/XendDomain.py	Wed Nov 16 11:33:13 2005 +0100
     3.3 @@ -466,17 +466,6 @@ class XendDomain:
     3.4          except Exception, ex:
     3.5              raise XendError(str(ex))
     3.6  
     3.7 -
     3.8 -    def domain_vif_limit_set(self, domid, vif, credit, period):
     3.9 -        """Limit the vif's transmission rate
    3.10 -        """
    3.11 -        dominfo = self.domain_lookup(domid)
    3.12 -        dev = dominfo.getDevice('vif', vif)
    3.13 -        if not dev:
    3.14 -            raise XendError("invalid vif")
    3.15 -        return dev.setCreditLimit(credit, period)
    3.16 -
    3.17 -
    3.18      def domain_maxmem_set(self, domid, mem):
    3.19          """Set the memory limit for a domain.
    3.20  
     4.1 --- a/tools/python/xen/xm/main.py	Wed Nov 16 11:32:19 2005 +0100
     4.2 +++ b/tools/python/xen/xm/main.py	Wed Nov 16 11:33:13 2005 +0100
     4.3 @@ -118,8 +118,6 @@ xm full list of subcommands:
     4.4          Create a new virtual network device 
     4.5      network-detach  <DomId> <DevId>  Destroy a domain's virtual network
     4.6                                       device, where <DevId> is the device ID.
     4.7 -    network-limit   <DomId> <Vif> <Credit> <Period>
     4.8 -        Limit the transmission rate of a virtual network interface
     4.9      network-list    <DomId>        List virtual network interfaces for a domain
    4.10  
    4.11    Vnet commands:
    4.12 @@ -557,13 +555,6 @@ def xm_log(args):
    4.13      from xen.xend.XendClient import server
    4.14      print server.xend_node_log()
    4.15  
    4.16 -def xm_network_limit(args):
    4.17 -    arg_check(args,4,"network-limit")
    4.18 -    dom = args[0]
    4.19 -    v = map(int, args[1:4])
    4.20 -    from xen.xend.XendClient import server
    4.21 -    server.xend_domain_vif_limit(dom, *v)
    4.22 -
    4.23  def xm_network_list(args):
    4.24      arg_check(args,1,"network-list")
    4.25      dom = args[0]
    4.26 @@ -716,7 +707,6 @@ commands = {
    4.27      # network
    4.28      "network-attach": xm_network_attach,
    4.29      "network-detach": xm_network_detach,
    4.30 -    "network-limit": xm_network_limit,
    4.31      "network-list": xm_network_list,
    4.32      # vnet
    4.33      "vnet-list": xm_vnet_list,
    4.34 @@ -739,7 +729,6 @@ for c in subcommands:
    4.35  aliases = {
    4.36      "balloon": "mem-set",
    4.37      "vif-list": "network-list",
    4.38 -    "vif-limit": "network-limit",
    4.39      "vbd-create": "block-create",
    4.40      "vbd-destroy": "block-destroy",
    4.41      "vbd-list": "block-list",