# HG changeset patch
# User John Levon <john.levon@sun.com>
# Date 1236822317 25200
# Node ID e92a56f3581975496d5d9f250823e46493e58548
# Parent 4a4bbf70a1fa246d132f2e709039c330a5506fe9
Skip tap pipe creation on Solaris
We don''t use them.
Signed-off-by: John Levon <john.levon@sun.com>
diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -28,6 +28,7 @@ import errno
import errno
import glob
import traceback
+import platform
import xen.lowlevel.xc
from xen.xend.XendConstants import *
@@ -227,23 +228,19 @@ class ImageHandler:
if self.device_model is None:
return
- # If we use a device model, the pipes for communication between
- # blktapctrl and ioemu must be present before the devices are
- # created (blktapctrl must access them for new block devices)
-
- # mkdir throws an exception if the path already exists
- try:
- os.mkdir(''/var/run/tap'', 0755)
- except:
- pass
-
- try:
- os.mkfifo(''/var/run/tap/qemu-read-%d'' % domid,
0600)
- os.mkfifo(''/var/run/tap/qemu-write-%d'' % domid,
0600)
- except OSError, e:
- log.warn(''Could not create blktap pipes for domain
%d'' % domid)
- log.exception(e)
- pass
+ if platform.system() != ''SunOS'':
+ # If we use a device model, the pipes for communication between
+ # blktapctrl and ioemu must be present before the devices are
+ # created (blktapctrl must access them for new block devices)
+ os.makedirs(''/var/run/tap'', 0755)
+
+ try:
+ os.mkfifo(''/var/run/tap/qemu-read-%d'' %
domid, 0600)
+ os.mkfifo(''/var/run/tap/qemu-write-%d'' %
domid, 0600)
+ except OSError, e:
+ log.warn(''Could not create blktap pipes for domain
%d'' % domid)
+ log.exception(e)
+ pass
# Return a list of cmd line args to the device models based on the
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel