From: Jan Kiszka <[email protected]> If the kernel is at the beginning or at the end of a region, before_kernel or after_kernel could stay None, and adding a NoneType object to the regions will make other parts unhappy. Better construct a list without any None elements.
Signed-off-by: Jan Kiszka <[email protected]> --- pyjailhouse/sysfs_parser.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pyjailhouse/sysfs_parser.py b/pyjailhouse/sysfs_parser.py index 19bc16c5..d1de8c79 100644 --- a/pyjailhouse/sysfs_parser.py +++ b/pyjailhouse/sysfs_parser.py @@ -116,20 +116,19 @@ def regions_split_by_kernel(tree): if kernel_stop > r.stop: kernel_stop = r.stop - before_kernel = None - after_kernel = None + result = [] # before Kernel if any if r.start < kernel_start: - before_kernel = MemRegion(r.start, kernel_start - 1, s) + result.append(MemRegion(r.start, kernel_start - 1, s)) - kernel_region = MemRegion(kernel_start, kernel_stop, "Kernel") + result.append(MemRegion(kernel_start, kernel_stop, "Kernel")) # after Kernel if any if r.stop > kernel_stop: - after_kernel = MemRegion(kernel_stop + 1, r.stop, s) + result.append(MemRegion(kernel_stop + 1, r.stop, s)) - return [before_kernel, kernel_region, after_kernel] + return result def parse_iomem_tree(tree): -- 2.26.2 -- 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 [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/b57456ee-5a6e-113d-72f4-3a0cdef95d36%40web.de.
