From 51a1f3e9b8f565c872720806c7cc261578cc253b Mon Sep 17 00:00:00 2001
From: Mitchel Humpherys <mitchelh@codeaurora.org>
Date: Wed, 24 Jun 2015 17:15:07 -0700
Subject: [PATCH] lrdp-v2: rename RamDump.major to RamDump.kernel_version
`major' is a bit of a misnomer, since the variable also includes the
minor version and patch version. Rename it to `kernel_version'.
Change-Id: Ic567131c7f12ab03c9dea2716242e9053c17372f
---
linux-ramdump-parser-v2/parsers/irqstate.py | 4 ++--
linux-ramdump-parser-v2/ramdump.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/linux-ramdump-parser-v2/parsers/irqstate.py b/linux-ramdump-parser-v2/parsers/irqstate.py
index fb94c9a..ec42864 100755
--- a/linux-ramdump-parser-v2/parsers/irqstate.py
+++ b/linux-ramdump-parser-v2/parsers/irqstate.py
@@ -74,7 +74,7 @@ class IrqParse(RamParser):
def radix_tree_lookup_element(self, ram_dump, root_addr, index):
rnode_offset = ram_dump.field_offset('struct radix_tree_root', 'rnode')
- if (ram_dump.major[0], ram_dump.major[1]) >= (3, 18):
+ if (ram_dump.kernel_version[0], ram_dump.kernel_version[1]) >= (3, 18):
rnode_height_offset = ram_dump.field_offset(
'struct radix_tree_node', 'path')
else:
@@ -98,7 +98,7 @@ class IrqParse(RamParser):
node_addr = ram_dump.read_word(root_addr + rnode_offset) & 0xfffffffffffffffe
height = ram_dump.read_int(node_addr + rnode_height_offset)
- if (ram_dump.major[0], ram_dump.major[1]) >= (3, 18):
+ if (ram_dump.kernel_version[0], ram_dump.kernel_version[1]) >= (3, 18):
height = height & radix_tree_height_mask
if height > len(height_to_maxindex):
diff --git a/linux-ramdump-parser-v2/ramdump.py b/linux-ramdump-parser-v2/ramdump.py
index ac48542..8c77aba 100644
--- a/linux-ramdump-parser-v2/ramdump.py
+++ b/linux-ramdump-parser-v2/ramdump.py
@@ -466,7 +466,7 @@ class RamDump():
self.ipc_log_debug = options.ipc_debug
self.ipc_log_help = options.ipc_help
self.use_stdout = options.stdout
- self.major = [0, 0, 0]
+ self.kernel_version = [0, 0, 0]
if options.ram_addr is not None:
# TODO sanity check to make sure the memory regions don't overlap
for file_path, start, end in options.ram_addr:
@@ -634,7 +634,7 @@ class RamDump():
self.version = v.group(1)
match = re.search('(\d+)\.(\d+)\.(\d+)', self.version)
if match is not None:
- self.major[0], self.major[1], self.major[2] = map(int, match.groups())
+ self.kernel_version = map(int, match.groups())
else:
print_out_str('!!! Could not extract version info! {0}'.format(self.version))
--
GitLab