This refactor allows us amore flexible use of the 'iomem' file format parsing
i.e. for ioports in the following commit.
No functional change.
Signed-off-by: Andrej Utz <andrej....@st.oth-regensburg.de>
---
pyjailhouse/sysfs_parser.py | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/pyjailhouse/sysfs_parser.py b/pyjailhouse/sysfs_parser.py
index fa32ba48..56265fb5 100644
--- a/pyjailhouse/sysfs_parser.py
+++ b/pyjailhouse/sysfs_parser.py
@@ -97,8 +97,8 @@ def input_listdir(dir, wildcards):
def parse_iomem(pcidevices):
- (regions, dmar_regions) = IOMemRegionTree.parse_iomem_tree(
- IOMemRegionTree.parse_iomem_file())
+ (regions, dmar_regions) = IOMapTree.parse_iomem_tree(
+ IOMapTree.parse_iomap_file('/proc/iomem', MemRegion))
rom_region = MemRegion(0xc0000, 0xdffff, 'ROMs')
add_rom_region = False
@@ -785,7 +785,7 @@ class IOAPIC:
return (self.iommu << 16) | self.bdf
-class IOMemRegionTree:
+class IOMapTree:
def __init__(self, region, level):
self.region = region
self.level = level
@@ -837,22 +837,22 @@ class IOMemRegionTree:
return [before_kernel, kernel_region, after_kernel]
@staticmethod
- def parse_iomem_line(line):
+ def parse_iomap_line(line, io_type):
a = line.split(':', 1)
level = int(a[0].count(' ') / 2) + 1
region = a[0].split('-', 1)
a[1] = a[1].strip()
- return level, MemRegion(int(region[0], 16), int(region[1], 16), a[1])
+ return level, io_type(int(region[0], 16), int(region[1], 16), a[1])
@staticmethod
- def parse_iomem_file():
- root = IOMemRegionTree(None, 0)
- f = input_open('/proc/iomem')
+ def parse_iomap_file(file_path, io_type):
+ root = IOMapTree(None, 0)
+ f = input_open(file_path)
lastlevel = 0
lastnode = root
for line in f:
- (level, r) = IOMemRegionTree.parse_iomem_line(line)
- t = IOMemRegionTree(r, level)
+ (level, r) = IOMapTree.parse_iomap_line(line, io_type)
+ t = IOMapTree(r, level)
if (t.level > lastlevel):
t.parent = lastnode
if (t.level == lastlevel):
@@ -884,8 +884,7 @@ class IOMemRegionTree:
# if the tree continues recurse further down ...
if (len(tree.children) > 0):
- regions.extend(
- IOMemRegionTree.find_regions_by_name(tree, name))
+ regions.extend(IOMapTree.find_regions_by_name(tree, name))
return regions
@@ -915,16 +914,15 @@ class IOMemRegionTree:
# generally blacklisted, with a few exceptions
if (s.lower() == 'reserved'):
- regions.extend(
- IOMemRegionTree.find_regions_by_name(tree, 'HPET'))
+ regions.extend(IOMapTree.find_regions_by_name(tree, 'HPET'))
dmar_regions.extend(
- IOMemRegionTree.find_regions_by_name(tree, 'dmar'))
+ IOMapTree.find_regions_by_name(tree, 'dmar'))
continue
# if the tree continues recurse further down ...
if (len(tree.children) > 0):
(temp_regions, temp_dmar_regions) = \
- IOMemRegionTree.parse_iomem_tree(tree)
+ IOMapTree.parse_iomem_tree(tree)
regions.extend(temp_regions)
dmar_regions.extend(temp_dmar_regions)
continue
--
2.21.0
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/20190605161745.2389-1-andrej.utz%40st.oth-regensburg.de.
For more options, visit https://groups.google.com/d/optout.
