diff options
| author | Joel Kitching <kitching@google.com> | 2020-01-20 10:55:28 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-21 12:54:54 +0000 |
| commit | f5367d598a985520a8c935f68ac90d295c7b8d8e (patch) | |
| tree | c32c50ae6994e39f3976ea13f929784776c2dc5a /tests/vboot_api_kernel4_tests.c | |
| parent | e6d3c638095ea8c4cc050ad42c1f439e79b6b641 (diff) | |
| download | vboot-f5367d598a985520a8c935f68ac90d295c7b8d8e.tar.gz | |
vboot: translate recovery reason info from vboot 2->1
Recovery reason should be passed into vboot kernel verification
API using vboot 2 data structures. Upon arrival, translate to
vboot 1 data structures for legacy purposes.
Also switch to using vboot 2 recovery_reason field in other parts
of vboot code.
BUG=b:124141368, chromium:1038260
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ic590db46d57ffbd8829f8f3ad784ea46184ceabc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2008534
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Diffstat (limited to 'tests/vboot_api_kernel4_tests.c')
| -rw-r--r-- | tests/vboot_api_kernel4_tests.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index aaafcc39..d413024e 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -296,25 +296,25 @@ static void VbSlkTest(void) /* Boot recovery */ ResetMocks(); - shared->recovery_reason = 123; + sd->recovery_reason = 123; vbboot_retval = -3; test_slk(VB2_ERROR_MOCK, 0, "Recovery boot bad"); ResetMocks(); - shared->recovery_reason = 123; + sd->recovery_reason = 123; new_version = 0x20003; test_slk(0, 0, "Recovery doesn't roll forward"); TEST_EQ(kernel_version, 0x10002, " version"); ResetMocks(); - shared->recovery_reason = 123; + sd->recovery_reason = 123; kernel_read_retval = TPM_E_IOERROR; kernel_write_retval = TPM_E_IOERROR; kernel_lock_retval = TPM_E_IOERROR; test_slk(0, 0, "Recovery ignore TPM errors"); ResetMocks(); - shared->recovery_reason = VB2_RECOVERY_TRAIN_AND_REBOOT; + sd->recovery_reason = VB2_RECOVERY_TRAIN_AND_REBOOT; test_slk(VBERROR_REBOOT_REQUIRED, 0, "Recovery train and reboot"); // todo: rkr/w/l fail ignored if recovery |