pvmfw: Parametrise GUEST_PAGE_SIZE
Replace the const with variables trickling down from a centralized
assignment, in preparation for reading it from the verified kernel.
Note: No functional change intended.
Bug: 339779843
Bug: 339782511
Test: m pvmfw_bin
Change-Id: I5f88ff52cb3d8deb220568f789e6569862505e75
diff --git a/guest/pvmfw/avb/src/verify.rs b/guest/pvmfw/avb/src/verify.rs
index a073502..c85d886 100644
--- a/guest/pvmfw/avb/src/verify.rs
+++ b/guest/pvmfw/avb/src/verify.rs
@@ -45,6 +45,8 @@
pub capabilities: Vec<Capability>,
/// Rollback index of kernel.
pub rollback_index: u64,
+ /// Page size of kernel, if present.
+ pub page_size: Option<usize>,
}
impl VerifiedBootData<'_> {
@@ -279,6 +281,7 @@
let descriptors = vbmeta_image.descriptors()?;
let hash_descriptors = HashDescriptors::get(&descriptors)?;
let capabilities = verify_property_and_get_capabilities(&descriptors)?;
+ let page_size = None; // TODO(ptosi): Read from payload.
if initrd.is_none() {
hash_descriptors.verify_no_initrd()?;
@@ -289,6 +292,7 @@
public_key: trusted_public_key,
capabilities,
rollback_index,
+ page_size,
});
}
@@ -309,5 +313,6 @@
public_key: trusted_public_key,
capabilities,
rollback_index,
+ page_size,
})
}