From: Jan Kiszka <jan.kis...@siemens.com>
To be reusing for merging RAM regions.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
pyjailhouse/sysfs_parser.py | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/pyjailhouse/sysfs_parser.py b/pyjailhouse/sysfs_parser.py
index b9e40f65..7067f779 100644
--- a/pyjailhouse/sysfs_parser.py
+++ b/pyjailhouse/sysfs_parser.py
@@ -935,18 +935,19 @@ class MemRegion(IORegion):
# round up to full PAGE_SIZE
return int((super(MemRegion, self).size() + 0xfff) / 0x1000) * 0x1000
- def flagstr(self, p=''):
- if (
- self.typestr == 'System RAM' or
+ def is_ram(self):
+ return (self.typestr == 'System RAM' or
self.typestr == 'Kernel' or
self.typestr == 'RAM buffer' or
self.typestr == 'ACPI DMAR RMRR' or
- self.typestr == 'ACPI IVRS'
- ):
- s = 'JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |\n'
- s += p + '\t\tJAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA'
- return s
- return 'JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE'
+ self.typestr == 'ACPI IVRS')
+
+ def flagstr(self, p=''):
+ if self.is_ram():
+ return 'JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |\n' + \
+ p + '\t\tJAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA'
+ else:
+ return 'JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE'
class PortRegion(IORegion):
--
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 jailhouse-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/c54b26397441ea9e580aba317071f5f98050f194.1599473999.git.jan.kiszka%40siemens.com.
