diff options
| author | Shriram Rajagopalan <rshriram@cs.ubc.ca> | 2011-03-31 18:06:36 +0100 |
|---|---|---|
| committer | Shriram Rajagopalan <rshriram@cs.ubc.ca> | 2011-03-31 18:06:36 +0100 |
| commit | 28745ea9bb4d23765d3000188dd2f480952df237 (patch) | |
| tree | 7ab63adf99548ab9eb698c21cfcea83bea9d1609 /tools/python | |
| parent | 5a04c93500d58e4026dbe179d641dedd9ce21b1e (diff) | |
| download | xen-28745ea9bb4d23765d3000188dd2f480952df237.tar.gz xen-28745ea9bb4d23765d3000188dd2f480952df237.tar.bz2 xen-28745ea9bb4d23765d3000188dd2f480952df237.zip | |
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>
Diffstat (limited to 'tools/python')
| -rw-r--r-- | tools/python/xen/remus/device.py | 4 | ||||
| -rw-r--r-- | tools/python/xen/xm/messages/xen-xm.pot | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/python/xen/remus/device.py b/tools/python/xen/remus/device.py index 047e9bf79a..0f923222d4 100644 --- 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 25c7556c30..e0dd4145db 100644 --- 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" |