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>
xen-unstable changeset:   21338:a915a11908e3
xen-unstable date:        Tue May 11 08:31:16 2010 +0100

tools/python/xen/xm/create.py

@@ -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'
 

tools/python/xen/xm/main.py

@@ -2487,8 +2487,10 @@ def xm_usb_list_assignable_devices(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'