[Xen-changelog] [xen-unstable] merge with xen-ia64-unstable.hg

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxxx
# Node ID fb107b9eee86d498164a268fb6d65295c280d2c4
# Parent  f78e499dd669c5736abb8c3b8c6bf16cf3ec7f3f
# Parent  4d47322a7729ed8b06d2665e9e4356cf09812ca9
merge with xen-ia64-unstable.hg
---
 tools/python/xen/util/security.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff -r f78e499dd669 -r fb107b9eee86 tools/python/xen/util/security.py
--- a/tools/python/xen/util/security.py Tue Nov 14 14:59:37 2006 -0700
+++ b/tools/python/xen/util/security.py Wed Nov 15 00:14:41 2006 +0000
@@ -606,11 +606,17 @@ def unify_resname(resource):
 
     # sanity check on resource name
     try:
-        (type, resfile) = resource.split(":")
+        (type, resfile) = resource.split(":", 1)
     except:
         err("Resource spec '%s' contains no ':' delimiter" % resource)
 
-    if type == "phy":
+    if type == "tap":
+        try:
+            (subtype, resfile) = resfile.split(":")
+        except:
+            err("Resource spec '%s' contains no tap subtype" % resource)
+
+    if type in ["phy", "tap"]:
         if not resfile.startswith("/"):
             resfile = "/dev/" + resfile
 
@@ -619,6 +625,8 @@ def unify_resname(resource):
         err("Invalid resource.")
 
     # from here on absolute file names with resources
+    if type == "tap":
+        type = type + ":" + subtype
     resource = type + ":" + resfile
     return resource
 

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