diff options
| author | Joel Kitching <kitching@google.com> | 2019-07-25 18:26:18 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-13 06:14:05 +0000 |
| commit | ecdca931ae0637d1a9498f64862939bd5bb99e0b (patch) | |
| tree | fac935a23124d281c72b765333cedaca446bb1e4 /tests/vboot_api_devmode_tests.c | |
| parent | 87276ffed46b3c64ff62153ac8599a79b9bcb683 (diff) | |
| download | vboot-ecdca931ae0637d1a9498f64862939bd5bb99e0b.tar.gz | |
vboot: move vb2_context inside vb2_shared_data (persistent context)
Move vb2_context to live inside of vb2_shared_data, instead of
in a separate memory space allocated by the caller.
See design doc:
http://go/vboot2-persistent-context
BUG=b:124141368, chromium:994060
TEST=make clean && make runtests
BRANCH=none
Change-Id: If2421756572a43ba58b9da9f00e56a8f26ad3ad5
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1874753, chromium:1902339
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1716351
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Julius Werner <jwerner@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests/vboot_api_devmode_tests.c')
| -rw-r--r-- | tests/vboot_api_devmode_tests.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c index 7126850e..03454890 100644 --- a/tests/vboot_api_devmode_tests.c +++ b/tests/vboot_api_devmode_tests.c @@ -93,7 +93,7 @@ test_case_t test[] = { /* Mock data */ static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE]; -static struct vb2_context ctx; +static struct vb2_context *ctx; static struct vb2_shared_data *sd; static struct vb2_gbb_header gbb; static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE]; @@ -114,13 +114,11 @@ extern int audio_open_count; /* Reset mock data (for use before each test) */ static void ResetMocks(void) { - memset(&ctx, 0, sizeof(ctx)); - ctx.workbuf = workbuf; - ctx.workbuf_size = sizeof(workbuf); - vb2_init_context(&ctx); - vb2_nv_init(&ctx); + TEST_SUCC(vb2api_init(workbuf, sizeof(workbuf), &ctx), + "vb2api_init failed"); + vb2_nv_init(ctx); - sd = vb2_get_sd(&ctx); + sd = vb2_get_sd(ctx); sd->vbsd = shared; memset(&gbb, 0, sizeof(gbb)); @@ -284,7 +282,7 @@ static void VbBootDeveloperSoundTest(void) kbd_fire_at = test[i].keypress_at_count; max_events = test[i].num_events; expected_event = test[i].notes; - (void) VbBootDeveloper(&ctx); + (void) VbBootDeveloper(ctx); VbExBeep(0, 0); /* Dummy call to determine end time */ VB2_DEBUG("INFO: matched %d total %d expected %d\n", matched_events, current_event, test[i].num_events); |