[Xen-changelog] [xen-4.0-testing] xm: explicitly differentiate between tap and tap2 in config parsing.

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273563652 -3600
# Node ID be5c53e9f1b8c40a8f052d92899927827f0ace07
# Parent  699178eba7eb96bd2dfee33ceaa9ec89998f18c2
xm: explicitly differentiate between tap and tap2 in config parsing.

From: Jim Fehlig <jfehlig@xxxxxxxxxx>
Signed-off-by: Keir Fraser <Keir.Fraser@xxxxxxxxxxxxx>
xen-unstable changeset:   21338:a915a11908e3
xen-unstable date:        Tue May 11 08:31:16 2010 +0100
---
 tools/python/xen/xm/create.py |    4 +++-
 tools/python/xen/xm/main.py   |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff -r 699178eba7eb -r be5c53e9f1b8 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Mon May 10 09:56:15 2010 +0100
+++ b/tools/python/xen/xm/create.py     Tue May 11 08:40:52 2010 +0100
@@ -783,8 +783,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 699178eba7eb -r be5c53e9f1b8 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Mon May 10 09:56:15 2010 +0100
+++ b/tools/python/xen/xm/main.py       Tue May 11 08:40:52 2010 +0100
@@ -2487,8 +2487,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@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog