aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-04-21 08:35:41 +0100
committerKeir Fraser <keir.fraser@citrix.com>2010-04-21 08:35:41 +0100
commit84bd8799daad318091bcfc3c6652a7e2a4952015 (patch)
treec73625323345c9d182e5566ee673d24f0838dd90
parent39c155b3bb4fef71c24c6cf9870f9b219591b277 (diff)
downloadxen-84bd8799daad318091bcfc3c6652a7e2a4952015.tar.gz
xen-84bd8799daad318091bcfc3c6652a7e2a4952015.tar.bz2
xen-84bd8799daad318091bcfc3c6652a7e2a4952015.zip
xend: support 'ioemu' subtype in tap protocol specification
blktapctrl supports both 'tapdisk' and 'ioemu' subtypes in tap protocol specification. Support the 'ioemu' subtype in xend BlktapController as well. Signed-off-by: Jim Fehlig <jfehlig@novell.com> xen-unstable changeset: 21194:551a8406e840 xen-unstable date: Mon Apr 19 08:59:14 2010 +0100
-rw-r--r--tools/python/xen/xend/server/BlktapController.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/python/xen/xend/server/BlktapController.py b/tools/python/xen/xend/server/BlktapController.py
index 48cd13e152..a34a2b82d7 100644
--- a/tools/python/xen/xend/server/BlktapController.py
+++ b/tools/python/xen/xend/server/BlktapController.py
@@ -189,7 +189,7 @@ class Blktap2Controller(BlktapController):
blktap2_installed=1;
if typ in ('tap'):
- if subtyp in ('tapdisk'):
+ if subtyp in ('tapdisk', 'ioemu'):
if params not in blktap2_disk_types or not blktap2_installed:
# pass this device off to BlktapController
log.warn('WARNING: using deprecated blktap module')