From e1e0d85b4d0d89db66bfe3006d028e458b4026b1 Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Tue, 30 Aug 2011 17:16:42 +0100 Subject: [PATCH] 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 Committed-by: Ian Jackson xen-unstable changeset: 23109:c8ae80a11d47 Backport-requested: Shriram Rajagopalan Committed-by: Ian Jackson --- tools/python/xen/remus/device.py | 4 ++-- 1 file changed, 2 insertions(+), 2 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)