[Xen-changelog] [xen-4.1-testing] remus: fix check for installed qdiscs on ifb

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Shriram Rajagopalan <rshriram@xxxxxxxxx>
# Date 1314721002 -3600
# Node ID f829cb802b91313d17001c73b1b64e4172f1d290
# Parent  20bc824fde06e6825ac61109eaa029211726a4e5
remus: fix check for installed qdiscs on ifb

current check includes ingress and pfifo_fast.
Add mq to the list of allowed qdiscs already installed
on ifb. This patch fixes cases where remus fails to start,
due to an mq qdisc already present on the vif.

Signed-off-by: Shriram Rajagopalan <rshriram@xxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

xen-unstable changeset: 23109:c8ae80a11d47
Backport-requested: Shriram Rajagopalan <rshriram@xxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 20bc824fde06 -r f829cb802b91 tools/python/xen/remus/device.py
--- a/tools/python/xen/remus/device.py  Tue Aug 30 17:02:33 2011 +0100
+++ b/tools/python/xen/remus/device.py  Tue Aug 30 17:16:42 2011 +0100
@@ -320,9 +320,9 @@
             if q['kind'] == 'plug':
                 self.installed = True
                 return
-            if q['kind'] not in ('ingress', 'pfifo_fast'):
+            if q['kind'] not in ('ingress', 'pfifo_fast', 'mq'):
                 raise BufferedNICException('there is already a queueing '
-                                           'discipline on %s' % devname)
+                                           'discipline %s on %s' % (q['kind'], 
devname))
 
         print ('installing buffer on %s... ' % devname),
         req = qdisc.addrequest(self.bufdevno, self.handle, self.q)

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