From a80b94ef602eec55dc2bf22cb981543bbf8820bd Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 11 May 2010 08:40:52 +0100 Subject: [PATCH] xm: explicitly differentiate between tap and tap2 in config parsing. From: Jim Fehlig Signed-off-by: Keir Fraser 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 --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 73a6121c63..c8e0ab8fa6 100644 --- a/tools/python/xen/xm/create.py +++ b/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' diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index 0ebcb35fb2..817a4df512 100644 --- a/tools/python/xen/xm/main.py +++ b/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'