Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1273563076 -3600
# Node ID a915a11908e3ab970887a313279650bc1d50c539
# Parent c7e9f1b99b2293172f8d5536aff47c9e7d852ab7
xm: explicitly differentiate between tap and tap2 in config parsing.

From: Jim Fehlig <jfehlig@novell.com>
Signed-off-by: Keir Fraser <Keir.Fraser@eu.citrix.com>
---
tools/python/xen/xm/create.py | 4 +++-
tools/python/xen/xm/main.py | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)

diff -r c7e9f1b99b22 -r a915a11908e3 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py Mon May 10 09:27:17 2010 +0100
+++ b/tools/python/xen/xm/create.py Tue May 11 08:31:16 2010 +0100
@@ -787,8 +787,10 @@ def configure_disks(config_devs, vals):
"""Create the config for disks (virtual block devices).
"""
for (uname, dev, mode, backend, protocol) in vals.disk:
- if uname.startswith('tap:'):
+ if uname.startswith('tap2:'):
cls = 'tap2'
+ elif uname.startswith('tap:'):
+ cls = 'tap'
else:
cls = 'vbd'

diff -r c7e9f1b99b22 -r a915a11908e3 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py Mon May 10 09:27:17 2010 +0100
+++ b/tools/python/xen/xm/main.py Tue May 11 08:31:16 2010 +0100
@@ -2634,8 +2634,10 @@ def parse_block_configuration(args):
def parse_block_configuration(args):
dom = args[0]

- if args[1].startswith('tap:'):
+ if args[1].startswith('tap2:'):
cls = 'tap2'
+ elif args[1].startswith('tap:'):
+ cls = 'tap'
else:
cls = 'vbd'


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