Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-23 07:03:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

m1n1.hv: Copy /chosen/memory-map/preoslog if it exists

Browse source 
preoslog was added in macos 12.3 and seems to contain iBootStage1 log
output. Since macos 12.3 accesses it it has to be copied to after the
guest image.

Signed-off-by: Janne Grunau <j@jannau.net>
This commit is contained in:
Janne Grunau 2022-03-19 15:07:18 +01:00 committed by Hector Martin
parent 0a1a9348c3
commit df53f16f76
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
proxyclient/m1n1/hv.py
View file

@ -1287,10 +1287,16 @@ class HV(Reloadable):
image = macho.prepare_image() image = macho.prepare_image()
sepfw_start, sepfw_length = self.u.adt["chosen"]["memory-map"].SEPFW sepfw_start, sepfw_length = self.u.adt["chosen"]["memory-map"].SEPFW
tc_start, tc_size = self.u.adt["chosen"]["memory-map"].TrustCache tc_start, tc_size = self.u.adt["chosen"]["memory-map"].TrustCache
if hasattr(self.u.adt["chosen"]["memory-map"], "preoslog"):
preoslog_start, preoslog_size = self.u.adt["chosen"]["memory-map"].preoslog
else:
preoslog_size = 0
image_size = align(len(image)) image_size = align(len(image))
sepfw_off = image_size sepfw_off = image_size
image_size += align(sepfw_length) image_size += align(sepfw_length)
preoslog_off = image_size
image_size += preoslog_size
self.bootargs_off = image_size self.bootargs_off = image_size
bootargs_size = 0x4000 bootargs_size = 0x4000
image_size += bootargs_size image_size += bootargs_size
@ -1329,11 +1335,17 @@ class HV(Reloadable):
print(f"Copying TrustCache (0x{tc_size:x} bytes)...") print(f"Copying TrustCache (0x{tc_size:x} bytes)...")
self.p.memcpy8(tc_base, tc_start, tc_size) self.p.memcpy8(tc_base, tc_start, tc_size)
if hasattr(self.u.adt["chosen"]["memory-map"], "preoslog"):
print(f"Copying preoslog (0x{preoslog_size:x} bytes)...")
self.p.memcpy8(guest_base + preoslog_off, preoslog_start, preoslog_size)
print(f"Adjusting addresses in ADT...") print(f"Adjusting addresses in ADT...")
self.adt["chosen"]["memory-map"].SEPFW = (guest_base + sepfw_off, sepfw_length) self.adt["chosen"]["memory-map"].SEPFW = (guest_base + sepfw_off, sepfw_length)
self.adt["chosen"]["memory-map"].TrustCache = (tc_base, tc_size) self.adt["chosen"]["memory-map"].TrustCache = (tc_base, tc_size)
self.adt["chosen"]["memory-map"].DeviceTree = (self.adt_base, align(self.u.ba.devtree_size)) self.adt["chosen"]["memory-map"].DeviceTree = (self.adt_base, align(self.u.ba.devtree_size))
self.adt["chosen"]["memory-map"].BootArgs = (guest_base + self.bootargs_off, bootargs_size) self.adt["chosen"]["memory-map"].BootArgs = (guest_base + self.bootargs_off, bootargs_size)
if hasattr(self.u.adt["chosen"]["memory-map"], "preoslog"):
self.adt["chosen"]["memory-map"].preoslog = (guest_base + preoslog_off, preoslog_size)
print(f"Setting up bootargs at 0x{guest_base + self.bootargs_off:x}...") print(f"Setting up bootargs at 0x{guest_base + self.bootargs_off:x}...")