Attachment 149104 Details for Bug 230702 – xen-3.0.4-boot-raw-tap.patch

[patch] xen-3.0.4-boot-raw-tap.patch

xen-3.0.4-boot-raw-tap.patch (text/plain), 2.07 KB, created by Mark McLoughlin on 2007-03-02 12:01:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark McLoughlin

Created: 2007-03-02 12:01:11 UTC

Size: 2.07 KB

patch

obsolete

>--- xen-3.0.4_1-src/tools/python/xen/util/blkif.py.boot-raw-tap	2007-03-02 11:17:44.000000000 +0000
>+++ xen-3.0.4_1-src/tools/python/xen/util/blkif.py	2007-03-02 11:20:34.000000000 +0000
>@@ -66,16 +66,23 @@
>                 'type'         : 'Disk' }
>     return val
> 
>-def blkdev_uname_to_file(uname):
>-    """Take a blkdev uname and return the corresponding filename."""
>-    fn = None
>+def _parse_uname(uname):
>+    fn = taptype = None
>     if uname.find(":") != -1:
>         (typ, fn) = uname.split(":", 1)
>         if typ == "phy" and not fn.startswith("/"):
>             fn = "/dev/%s" %(fn,)
>         if typ == "tap":
>-            (typ, fn) = fn.split(":", 1)
>-    return fn
>+            (taptype, fn) = fn.split(":", 1)
>+    return (fn, taptype)
>+
>+def blkdev_uname_to_file(uname):
>+    """Take a blkdev uname and return the corresponding filename."""
>+    return _parse_uname(uname)[0]
>+
>+def blkdev_uname_to_taptype(uname):
>+    """Take a blkdev uname and return the blktap type."""
>+    return _parse_uname(uname)[1]
> 
> def mount_mode(name):
>     mode = None
>--- xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py.boot-raw-tap	2007-03-02 11:21:18.000000000 +0000
>+++ xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py	2007-03-02 11:24:03.000000000 +0000
>@@ -34,7 +34,7 @@
> 
> import xen.lowlevel.xc
> from xen.util import asserts
>-from xen.util.blkif import blkdev_uname_to_file
>+from xen.util.blkif import blkdev_uname_to_file, blkdev_uname_to_taptype
> from xen.util import security
> 
> from xen.xend import balloon, sxp, uuid, image, arch
>@@ -1562,7 +1562,8 @@
>                 if disk is None:
>                     continue
>                 fn = blkdev_uname_to_file(disk)
>-                mounted = devtype == 'tap' and not os.stat(fn).st_rdev
>+                taptype = blkdev_uname_to_taptype(disk)
>+                mounted = devtype == 'tap' and taptype != 'aio' and taptype != 'sync' and not os.stat(fn).st_rdev
>                 if mounted:
>                     # This is a file, not a device.  pygrub can cope with a
>                     # file if it's raw, but if it's QCOW or other such formats

Actions: View | Diff

Attachments on bug 230702: 149104