summaryrefslogtreecommitdiff
path: root/tests/vboot_api_kernel_tests.c
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2021-04-22 21:11:50 +0800
committerCommit Bot <commit-bot@chromium.org>2021-06-15 19:35:55 +0000
commitda50d8587ae24b1a5e7528dde1ead5523e78f6b2 (patch)
tree36f5fa76495c54d6421d8221b25146a86670f9ec /tests/vboot_api_kernel_tests.c
parent43fa783cbf6014d23d8b23b5eb7b4e63b17864ec (diff)
downloadvboot-da50d8587ae24b1a5e7528dde1ead5523e78f6b2.tar.gz
vboot/vboot_kernel: remove LoadKernelParams struct
LoadKernelParams struct is identical to VbSelectAndLoadKernelParams. Remove it, and use the public interface internally. This CL is part of a series to merge vboot1 and vboot2.0 kernel verification code; see b/181739551. BUG=b:181739551 TEST=make clean && make runtests BRANCH=none Signed-off-by: Joel Kitching <kitching@google.com> Change-Id: I8b820d18c1e9a66404a7a091aa3ccc1b050a559d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2846282 Tested-by: Joel Kitching <kitching@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests/vboot_api_kernel_tests.c')
-rw-r--r--tests/vboot_api_kernel_tests.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c
index b5e1e7c3..9904770b 100644
--- a/tests/vboot_api_kernel_tests.c
+++ b/tests/vboot_api_kernel_tests.c
@@ -312,7 +312,7 @@ static void ResetMocks(int i)
TEST_SUCC(vb2api_init(workbuf, sizeof(workbuf), &ctx),
"vb2api_init failed");
- memset(VbApiKernelGetParams(), 0, sizeof(LoadKernelParams));
+ memset(VbApiKernelGetParams(), 0, sizeof(VbSelectAndLoadKernelParams));
memset(&mock_disks, 0, sizeof(mock_disks));
load_kernel_calls = 0;
@@ -395,7 +395,8 @@ vb2_error_t VbExDiskFreeInfo(VbDiskInfo *infos,
return VB2_SUCCESS;
}
-vb2_error_t LoadKernel(struct vb2_context *c, LoadKernelParams *params,
+vb2_error_t LoadKernel(struct vb2_context *c,
+ VbSelectAndLoadKernelParams *params,
VbDiskInfo *disk_info)
{
got_find_disk = (const char *)params->disk_handle;