Skip to contentSkip to conversation

tools: fix sysfs error path

PATCH New Christoph Egger 1 participant 1 message Jan 21, 2010

lore
Share & tools
lore

Christoph Egger

author
#0 lore raw

PATCH 1/1 tools: fix sysfs error path

Hi!

Attached patch fixes sysfs error path. NetBSD also has a /proc/mounts file but no sysfs. On Linux you can test this with sysfs not mounted.

Signed-off-by Christoph Egger <[email protected]>
Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
tools/python/xen/util/pci.py +2 -0
diff -r 35a9ca776c34 tools/python/xen/util/pci.py
@@ -441,6 +441,8 @@ def find_sysfs_mnt():
 
 def get_all_pci_names():
     sysfs_mnt = find_sysfs_mnt()
+    if sysfs_mnt is None:
+        return None
     pci_names = os.popen('ls ' + sysfs_mnt + SYSFS_PCI_DEVS_PATH).read().split()
     return pci_names
tools/python/xen/util/utils.py +3 -1
diff -r 35a9ca776c34 tools/python/xen/util/utils.py
@@ -68,7 +68,9 @@ def find_sysfs_mount():
                 continue
             if sline[2] == 'sysfs':
                 sysfs_mount_point= sline[1]
-                return sysfs_mount_point
+                break
+        mounts_file.close()
+        return sysfs_mount_point
     except IOError, (errno, strerr):
         raise
tools/python/xen/util/vscsi_util.py +3 -0
diff -r 35a9ca776c34 tools/python/xen/util/vscsi_util.py
@@ -123,6 +123,9 @@ def _vscsi_get_scsidevices_by_sysfs():
     except:
         return devices
 
+    if sysfs_mnt is None:
+        return devices
+
     for dirpath, dirnames, files in os.walk(sysfs_mnt + SYSFS_SCSI_PATH):
         for hctl in dirnames:
             paths = os.path.join(dirpath, hctl)

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel