[Xen-changelog] merge.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 592d8f74d23dc1753ccfc049cc08a368f7badf1b
# Parent  2e0700008a8703e532999ce02ff9331a367a5ca4
# Parent  5019c8d034c42bc343000ff450ef90476846c2c3
merge.

diff -r 2e0700008a87 -r 592d8f74d23d docs/man/xm.pod.1
--- a/docs/man/xm.pod.1 Wed Nov 16 10:32:19 2005
+++ b/docs/man/xm.pod.1 Wed Nov 16 10:33:13 2005
@@ -645,10 +645,6 @@
 
 =item B<network-detach> I<domain-id> I<devid>
 
-=item B<network-limit> I<domain-id> I<vif> I<credit> I<period>
-
-Limit the transmission rate of a virtual network interface.
-
 =item B<network-list> I<domain-id>
 
 List virtual network interfaces for a domain.  The returned output is
diff -r 2e0700008a87 -r 592d8f74d23d tools/python/xen/xend/XendClient.py
--- a/tools/python/xen/xend/XendClient.py       Wed Nov 16 10:32:19 2005
+++ b/tools/python/xen/xend/XendClient.py       Wed Nov 16 10:33:13 2005
@@ -301,13 +301,6 @@
         return self.xendPost(self.domainurl(dom),
                             {'op'    : 'set_vcpus',
                              'vcpus' : vcpus })
-
-    def xend_domain_vif_limit(self, id, vif, credit, period):
-        return self.xendPost(self.domainurl(id),
-                            { 'op'      : 'vif_limit_set',
-                              'vif'     : vif,
-                              'credit'  : credit,
-                              'period'  : period })
 
     def xend_domain_devices(self, id, type):
         return self.xendPost(self.domainurl(id),
diff -r 2e0700008a87 -r 592d8f74d23d tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py       Wed Nov 16 10:32:19 2005
+++ b/tools/python/xen/xend/XendDomain.py       Wed Nov 16 10:33:13 2005
@@ -466,17 +466,6 @@
         except Exception, ex:
             raise XendError(str(ex))
 
-
-    def domain_vif_limit_set(self, domid, vif, credit, period):
-        """Limit the vif's transmission rate
-        """
-        dominfo = self.domain_lookup(domid)
-        dev = dominfo.getDevice('vif', vif)
-        if not dev:
-            raise XendError("invalid vif")
-        return dev.setCreditLimit(credit, period)
-
-
     def domain_maxmem_set(self, domid, mem):
         """Set the memory limit for a domain.
 
diff -r 2e0700008a87 -r 592d8f74d23d tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Wed Nov 16 10:32:19 2005
+++ b/tools/python/xen/xm/main.py       Wed Nov 16 10:33:13 2005
@@ -118,8 +118,6 @@
         Create a new virtual network device 
     network-detach  <DomId> <DevId>  Destroy a domain's virtual network
                                      device, where <DevId> is the device ID.
-    network-limit   <DomId> <Vif> <Credit> <Period>
-        Limit the transmission rate of a virtual network interface
     network-list    <DomId>        List virtual network interfaces for a domain
 
   Vnet commands:
@@ -556,13 +554,6 @@
 def xm_log(args):
     from xen.xend.XendClient import server
     print server.xend_node_log()
-
-def xm_network_limit(args):
-    arg_check(args,4,"network-limit")
-    dom = args[0]
-    v = map(int, args[1:4])
-    from xen.xend.XendClient import server
-    server.xend_domain_vif_limit(dom, *v)
 
 def xm_network_list(args):
     arg_check(args,1,"network-list")
@@ -716,7 +707,6 @@
     # network
     "network-attach": xm_network_attach,
     "network-detach": xm_network_detach,
-    "network-limit": xm_network_limit,
     "network-list": xm_network_list,
     # vnet
     "vnet-list": xm_vnet_list,
@@ -739,7 +729,6 @@
 aliases = {
     "balloon": "mem-set",
     "vif-list": "network-list",
-    "vif-limit": "network-limit",
     "vbd-create": "block-create",
     "vbd-destroy": "block-destroy",
     "vbd-list": "block-list",

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