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

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Shriram Rajagopalan <rshriram@xxxxxxxxx>
# Date 1301591196 -3600
# Node ID c8ae80a11d4772f8b1e28fb1364590532da95519
# Parent  45eeeb6d0481efaab2a59941e1b8e061aead37d4
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>
---


diff -r 45eeeb6d0481 -r c8ae80a11d47 tools/python/xen/remus/device.py
--- a/tools/python/xen/remus/device.py  Tue Mar 29 16:34:01 2011 +0100
+++ b/tools/python/xen/remus/device.py  Thu Mar 31 18:06:36 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)
diff -r 45eeeb6d0481 -r c8ae80a11d47 tools/python/xen/xm/messages/xen-xm.pot
--- a/tools/python/xen/xm/messages/xen-xm.pot   Tue Mar 29 16:34:01 2011 +0100
+++ b/tools/python/xen/xm/messages/xen-xm.pot   Thu Mar 31 18:06:36 2011 +0100
@@ -8,11 +8,10 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-25 21:46+0000\n"
+"POT-Creation-Date: 2011-03-31 18:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

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