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@cs.ubc.ca>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/python/xen/remus/device.py b/tools/python/xen/remus/device.py
index 047e9bf79a045d6b785efa1a2ea7b803f44d90dd..0f923222d4608169fc88f46eb6a3983144a9e0f9 100644 (file)
--- a/tools/python/xen/remus/device.py
+++ b/tools/python/xen/remus/device.py
@@ -320,9 +320,9 @@ class BufferedNIC(CheckpointedDevice):
             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 --git a/tools/python/xen/xm/messages/xen-xm.pot b/tools/python/xen/xm/messages/xen-xm.pot
index 25c7556c30e119bd6cbacfa71eee7cbb0815ca87..e0dd4145db85ec21222efb7bd80696bd717fbe06 100644 (file)
--- a/tools/python/xen/xm/messages/xen-xm.pot
+++ b/tools/python/xen/xm/messages/xen-xm.pot
@@ -8,11 +8,10 @@ msgid ""
 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@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"