vboot: replace VBERROR_SUCCESS with VB2_SUCCESS

Replace vboot1-style VBERROR_SUCCESS with VB2_SUCCESS
(trivial change since both are equal values).

BUG=b:124141368, chromium:988410
TEST=make clean && make runtests
BRANCH=none

Change-Id: I46e02471a031e9f36ec869d11d0b957d1c1b5769
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1728114
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1722915
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>

12 files changed, 94 insertions, 94 deletions

diff --git a/tests/ec_sync_tests.c b/tests/ec_sync_tests.c
index 038c7ef6..ac4a4c52 100644
--- a/tests/ec_sync_tests.c
+++ b/tests/ec_sync_tests.c
@@ -87,11 +87,11 @@ static void ResetMocks(void)
 	ec_run_image = 0;   /* 0 = RO, 1 = RW */
 	ec_ro_updated = 0;
 	ec_rw_updated = 0;
-	in_rw_retval = VBERROR_SUCCESS;
-	protect_retval = VBERROR_SUCCESS;
-	update_retval = VBERROR_SUCCESS;
-	run_retval = VBERROR_SUCCESS;
-	get_expected_retval = VBERROR_SUCCESS;
+	in_rw_retval = VB2_SUCCESS;
+	protect_retval = VB2_SUCCESS;
+	update_retval = VB2_SUCCESS;
+	run_retval = VB2_SUCCESS;
+	get_expected_retval = VB2_SUCCESS;
 	shutdown_request_calls_left = -1;
 
 	memset(mock_ec_ro_hash, 0, sizeof(mock_ec_ro_hash));
@@ -113,7 +113,7 @@ static void ResetMocks(void)
 	memset(screens_displayed, 0, sizeof(screens_displayed));
 	screens_count = 0;
 
-	ec_aux_fw_retval = VBERROR_SUCCESS;
+	ec_aux_fw_retval = VB2_SUCCESS;
 	ec_aux_fw_mock_severity = VB_AUX_FW_NO_UPDATE;
 	ec_aux_fw_update_severity = VB_AUX_FW_NO_UPDATE;
 	ec_aux_fw_update_req = 0;
@@ -175,7 +175,7 @@ vb2_error_t VbExEcHashImage(int devidx, enum VbSelectFirmware_t select,
 		mock_ec_ro_hash : mock_ec_rw_hash;
 	*hash_size = select == VB_SELECT_FIRMWARE_READONLY ?
 		     mock_ec_ro_hash_size : mock_ec_rw_hash_size;
-	return *hash_size ? VBERROR_SUCCESS : VBERROR_SIMULATED;
+	return *hash_size ? VB2_SUCCESS : VBERROR_SIMULATED;
 }
 
 vb2_error_t VbExEcGetExpectedImage(int devidx, enum VbSelectFirmware_t select,
@@ -194,7 +194,7 @@ vb2_error_t VbExEcGetExpectedImageHash(int devidx,
 	*hash = want_ec_hash;
 	*hash_size = want_ec_hash_size;
 
-	return want_ec_hash_size ? VBERROR_SUCCESS : VBERROR_SIMULATED;
+	return want_ec_hash_size ? VB2_SUCCESS : VBERROR_SIMULATED;
 }
 
 vb2_error_t VbExEcUpdateImage(int devidx, enum VbSelectFirmware_t select,
@@ -216,14 +216,14 @@ vb2_error_t VbDisplayScreen(struct vb2_context *c, uint32_t screen, int force,
 	if (screens_count < ARRAY_SIZE(screens_displayed))
 		screens_displayed[screens_count++] = screen;
 
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExCheckAuxFw(VbAuxFwUpdateSeverity_t *severity)
 {
 	*severity = ec_aux_fw_mock_severity;
 	ec_aux_fw_update_severity = ec_aux_fw_mock_severity;
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExUpdateAuxFw()
@@ -378,7 +378,7 @@ static void VbSoftwareSyncTest(void)
 	mock_ec_rw_hash[0]++;
 	ctx.flags |= VB2_CONTEXT_EC_SYNC_SLOW;
 	vb2_nv_set(&ctx, VB2_NV_DISPLAY_REQUEST, 1);
-	test_ssync(VBERROR_SUCCESS, 0,
+	test_ssync(VB2_SUCCESS, 0,
 		   "Slow update with display request");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_WAIT, "  wait screen");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISPLAY_REQUEST), 1,
@@ -388,7 +388,7 @@ static void VbSoftwareSyncTest(void)
 	mock_ec_rw_hash[0]++;
 	ctx.flags |= VB2_CONTEXT_EC_SYNC_SLOW;
 	vb2_nv_set(&ctx, VB2_NV_DISPLAY_REQUEST, 0);
-	test_ssync(VBERROR_SUCCESS, 0,
+	test_ssync(VB2_SUCCESS, 0,
 		   "Slow update without display request (no reboot needed)");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_WAIT, "  wait screen");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISPLAY_REQUEST), 0,
@@ -436,7 +436,7 @@ static void VbSoftwareSyncTest(void)
 	ResetMocks();
 	gbb.flags |= VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC;
 	ec_aux_fw_mock_severity = VB_AUX_FW_FAST_UPDATE;
-	test_ssync(VBERROR_SUCCESS, 0,
+	test_ssync(VB2_SUCCESS, 0,
 		   "VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC"
 		   " disables auxiliary FW update request");
 	TEST_EQ(ec_aux_fw_update_req, 0, "  aux fw update disabled");
@@ -445,7 +445,7 @@ static void VbSoftwareSyncTest(void)
 	ResetMocks();
 	gbb.flags |= VB2_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC;
 	ec_aux_fw_mock_severity = VB_AUX_FW_FAST_UPDATE;
-	test_ssync(VBERROR_SUCCESS, 0,
+	test_ssync(VB2_SUCCESS, 0,
 		   "VB2_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC"
 		   " disables auxiliary FW update request");
 	TEST_EQ(ec_aux_fw_update_req, 0, "  aux fw update disabled");
@@ -453,7 +453,7 @@ static void VbSoftwareSyncTest(void)
 
 	ResetMocks();
 	ec_aux_fw_mock_severity = VB_AUX_FW_NO_DEVICE;
-	test_ssync(VBERROR_SUCCESS, 0,
+	test_ssync(VB2_SUCCESS, 0,
 		   "No auxiliary FW update needed");
 	TEST_EQ(screens_count, 0,
 		"  wait screen skipped");
@@ -462,7 +462,7 @@ static void VbSoftwareSyncTest(void)
 
 	ResetMocks();
 	ec_aux_fw_mock_severity = VB_AUX_FW_NO_UPDATE;
-	test_ssync(VBERROR_SUCCESS, 0,
+	test_ssync(VB2_SUCCESS, 0,
 		   "No auxiliary FW update needed");
 	TEST_EQ(screens_count, 0,
 		"  wait screen skipped");
diff --git a/tests/tlcl_tests.c b/tests/tlcl_tests.c
index 3bdb593e..a699135c 100644
--- a/tests/tlcl_tests.c
+++ b/tests/tlcl_tests.c
@@ -44,7 +44,7 @@ static void ResetMocks(void)
 	int i;
 
 	*debug_info = 0;
-	mock_retval = VBERROR_SUCCESS;
+	mock_retval = VB2_SUCCESS;
 
 	memset(calls, 0, sizeof(calls));
 	for (i = 0; i < MAXCALLS; i++)
@@ -101,7 +101,7 @@ uint32_t VbExTpmSendReceive(const uint8_t *request, uint32_t request_length,
 vb2_error_t VbExTpmGetRandom(uint8_t *buf, uint32_t length)
 {
 	memset(buf, 0xa5, length);
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 /**
@@ -112,14 +112,14 @@ static void TlclTest(void)
 	uint8_t buf[32], buf2[32];
 
 	ResetMocks();
-	TEST_EQ(TlclLibInit(), VBERROR_SUCCESS, "Init");
+	TEST_EQ(TlclLibInit(), VB2_SUCCESS, "Init");
 
 	ResetMocks();
 	mock_retval = VBERROR_SIMULATED;
 	TEST_EQ(TlclLibInit(), mock_retval, "Init bad");
 
 	ResetMocks();
-	TEST_EQ(TlclLibClose(), VBERROR_SUCCESS, "Close");
+	TEST_EQ(TlclLibClose(), VB2_SUCCESS, "Close");
 
 	ResetMocks();
 	mock_retval = VBERROR_SIMULATED;
diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c
index fcfd06e8..0989aa05 100644
--- a/tests/vboot_api_devmode_tests.c
+++ b/tests/vboot_api_devmode_tests.c
@@ -136,7 +136,7 @@ static void ResetMocks(void)
 	kbd_fire_at = 0;
 	kbd_fire_key = 0;
 
-	beep_return = VBERROR_SUCCESS;
+	beep_return = VB2_SUCCESS;
 	audio_open_count = 0;
 
 	matched_events = 0;
@@ -152,12 +152,12 @@ struct vb2_gbb_header *vb2_get_gbb(struct vb2_context *c)
 
 vb2_error_t VbExNvStorageRead(uint8_t* buf)
 {
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExNvStorageWrite(const uint8_t* buf)
 {
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExDiskGetInfo(VbDiskInfo** infos_ptr, uint32_t* count,
@@ -169,7 +169,7 @@ vb2_error_t VbExDiskGetInfo(VbDiskInfo** infos_ptr, uint32_t* count,
 vb2_error_t VbExDiskFreeInfo(VbDiskInfo* infos,
 			     VbExDiskHandle_t preserve_handle)
 {
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExDiskRead(VbExDiskHandle_t handle, uint64_t lba_start,
@@ -265,7 +265,7 @@ vb2_error_t VbExDisplayScreen(uint32_t screen_type, uint32_t locale,
 
 	VB2_DEBUG("  current_time is %d msec\n", current_time);
 
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 /****************************************************************************/
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c
index 56e8727a..035c0501 100644
--- a/tests/vboot_api_kernel2_tests.c
+++ b/tests/vboot_api_kernel2_tests.c
@@ -210,13 +210,13 @@ vb2_error_t VbExDiskGetInfo(VbDiskInfo **infos_ptr, uint32_t *count,
 	} else {
 		*count = 0;
 	}
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExDiskFreeInfo(VbDiskInfo *infos,
 			     VbExDiskHandle_t preserve_handle)
 {
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 int VbExTrustEC(int devidx)
@@ -245,7 +245,7 @@ vb2_error_t VbDisplayScreen(struct vb2_context *c, uint32_t screen, int force,
 	if (screens_count < ARRAY_SIZE(screens_displayed))
 		screens_displayed[screens_count++] = screen;
 
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t SetVirtualDevMode(int val)
@@ -259,7 +259,7 @@ vb2_error_t VbExSetVendorData(const char *vendor_data_value)
 	set_vendor_data_called = 1;
 	strncpy(set_vendor_data, vendor_data_value, sizeof(set_vendor_data));
 
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t vb2ex_tpm_set_mode(enum vb2_tpm_mode mode_val)
@@ -538,7 +538,7 @@ static void VbBootDevTest(void)
 	vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT,
 		   VB2_DEV_DEFAULT_BOOT_USB);
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1);
-	vbtlk_retval = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	TEST_EQ(VbBootDeveloper(&ctx), 0, "Ctrl+U USB");
 
 	/* Proceed to usb boot mode only if enabled */
@@ -773,21 +773,21 @@ static void VbBootDevTest(void)
 	ResetMocks();
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1);
 	mock_keypress[0] = VB_KEY_CTRL('U');
-	vbtlk_retval = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	TEST_EQ(VbBootDeveloper(&ctx), 0, "Ctrl+U USB");
 
 	/* Ctrl+U enabled via GBB */
 	ResetMocks();
 	gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_USB;
 	mock_keypress[0] = VB_KEY_CTRL('U');
-	vbtlk_retval = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	TEST_EQ(VbBootDeveloper(&ctx), 0, "Ctrl+U force USB");
 
 	/* Ctrl+U enabled via FWMP */
 	ResetMocks();
 	VbApiKernelGetFwmp()->flags |= FWMP_DEV_ENABLE_USB;
 	mock_keypress[0] = VB_KEY_CTRL('U');
-	vbtlk_retval = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	TEST_EQ(VbBootDeveloper(&ctx), 0, "Ctrl+U force USB");
 
 	/* Ctrl+S set vendor data and reboot */
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c
index 8ed46200..d0098164 100644
--- a/tests/vboot_api_kernel4_tests.c
+++ b/tests/vboot_api_kernel4_tests.c
@@ -80,8 +80,8 @@ static void ResetMocks(void)
 	rfr_retval = TPM_SUCCESS;
 
 	rkr_version = new_version = 0x10002;
-	rkr_retval = rkw_retval = rkl_retval = VBERROR_SUCCESS;
-	vbboot_retval = VBERROR_SUCCESS;
+	rkr_retval = rkw_retval = rkl_retval = VB2_SUCCESS;
+	vbboot_retval = VB2_SUCCESS;
 
 	memset(mock_switches, 0, sizeof(mock_switches));
 	mock_switches_count = 0;
@@ -94,14 +94,14 @@ vb2_error_t VbExNvStorageRead(uint8_t *buf)
 {
 	memcpy(buf, ctx_nvram_backend.nvdata,
 	       vb2_nv_get_size(&ctx_nvram_backend));
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExNvStorageWrite(const uint8_t *buf)
 {
 	memcpy(ctx_nvram_backend.nvdata, buf,
 	       vb2_nv_get_size(&ctx_nvram_backend));
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 uint32_t RollbackKernelRead(uint32_t *version)
diff --git a/tests/vboot_api_kernel5_tests.c b/tests/vboot_api_kernel5_tests.c
index a0833fd9..f806c509 100644
--- a/tests/vboot_api_kernel5_tests.c
+++ b/tests/vboot_api_kernel5_tests.c
@@ -203,7 +203,7 @@ vb2_error_t VbExNvStorageRead(uint8_t *buf)
 {
 	memcpy(buf, ctx_nvram_backend.nvdata,
 	       vb2_nv_get_size(&ctx_nvram_backend));
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 static void VerifyMemoryBootImageTest(void)
@@ -292,7 +292,7 @@ static void VerifyMemoryBootImageTest(void)
 	shared->flags = VBSD_BOOT_DEV_SWITCH_ON;
 	TEST_EQ(VbVerifyMemoryBootImage(&ctx, shared, &kparams, kernel_buffer,
 					kernel_buffer_size),
-		VBERROR_SUCCESS,
+		VB2_SUCCESS,
 		"Developer flag mismatch - dev switch on(gbb override)");
 
 	/* Recovery flag mismatch - dev switch on with GBB override */
@@ -304,7 +304,7 @@ static void VerifyMemoryBootImageTest(void)
 	gbb.flags = VB2_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP;
 	TEST_EQ(VbVerifyMemoryBootImage(&ctx, shared, &kparams, kernel_buffer,
 					kernel_buffer_size),
-		VBERROR_SUCCESS,
+		VB2_SUCCESS,
 		"Recovery flag mismatch - dev switch on(gbb override)");
 
 	/* Developer flag mismatch - dev switch off */
diff --git a/tests/vboot_api_kernel6_tests.c b/tests/vboot_api_kernel6_tests.c
index 7e2a7d40..553a7797 100644
--- a/tests/vboot_api_kernel6_tests.c
+++ b/tests/vboot_api_kernel6_tests.c
@@ -31,7 +31,7 @@ vb2_error_t SetVirtualDevMode(int val)
 {
 	if (virtual_dev_mode_fail)
 		return VBERROR_SIMULATED;
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 static void VbUnlockDeviceTest(void)
diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c
index 7afe6d04..5b1e71b9 100644
--- a/tests/vboot_api_kernel_tests.c
+++ b/tests/vboot_api_kernel_tests.c
@@ -78,14 +78,14 @@ test_case_t test[] = {
 			{512,  100,  VB_DISK_FLAG_REMOVABLE, "holygrail"},
 		},
 		.disk_count_to_return = DEFAULT_COUNT,
-		.diskgetinfo_return_val = VBERROR_SUCCESS,
+		.diskgetinfo_return_val = VB2_SUCCESS,
 		.loadkernel_return_val = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1,},
 		.external_expected = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},
 
 		.expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED,
 		.expected_to_find_disk = pickme,
 		.expected_to_load_disk = pickme,
-		.expected_return_val = VBERROR_SUCCESS
+		.expected_return_val = VB2_SUCCESS
 	},
 	{
 		.name = "first removable drive",
@@ -110,14 +110,14 @@ test_case_t test[] = {
 			{512,  100,  VB_DISK_FLAG_REMOVABLE, "holygrail"},
 		},
 		.disk_count_to_return = DEFAULT_COUNT,
-		.diskgetinfo_return_val = VBERROR_SUCCESS,
+		.diskgetinfo_return_val = VB2_SUCCESS,
 		.loadkernel_return_val = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1,},
 		.external_expected = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0,},
 
 		.expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED,
 		.expected_to_find_disk = pickme,
 		.expected_to_load_disk = pickme,
-		.expected_return_val = VBERROR_SUCCESS
+		.expected_return_val = VB2_SUCCESS
 	},
 	{
 		.name = "second removable drive",
@@ -129,13 +129,13 @@ test_case_t test[] = {
 			{512,  100,  VB_DISK_FLAG_REMOVABLE, pickme},
 		},
 		.disk_count_to_return = DEFAULT_COUNT,
-		.diskgetinfo_return_val = VBERROR_SUCCESS,
+		.diskgetinfo_return_val = VB2_SUCCESS,
 		.loadkernel_return_val = {1, 0, 1, 1, 1, 1, 1, 1, 1, 1,},
 
 		.expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED,
 		.expected_to_find_disk = pickme,
 		.expected_to_load_disk = pickme,
-		.expected_return_val = VBERROR_SUCCESS
+		.expected_return_val = VB2_SUCCESS
 	},
 	{
 		.name = "first fixed drive",
@@ -161,20 +161,20 @@ test_case_t test[] = {
 			{512,  100,  VB_DISK_FLAG_FIXED, "holygrail"},
 		},
 		.disk_count_to_return = DEFAULT_COUNT,
-		.diskgetinfo_return_val = VBERROR_SUCCESS,
+		.diskgetinfo_return_val = VB2_SUCCESS,
 		.loadkernel_return_val = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1,},
 
 		.expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED,
 		.expected_to_find_disk = pickme,
 		.expected_to_load_disk = pickme,
-		.expected_return_val = VBERROR_SUCCESS
+		.expected_return_val = VB2_SUCCESS
 	},
 	{
 		.name = "no drives at all",
 		.want_flags = VB_DISK_FLAG_FIXED,
 		.disks_to_provide = {},
 		.disk_count_to_return = DEFAULT_COUNT,
-		.diskgetinfo_return_val = VBERROR_SUCCESS,
+		.diskgetinfo_return_val = VB2_SUCCESS,
 		.loadkernel_return_val = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1,},
 
 		.expected_recovery_request_val = VB2_RECOVERY_RW_NO_DISK,
@@ -204,7 +204,7 @@ test_case_t test[] = {
 			{512,  100,  VB_DISK_FLAG_FIXED, "bad2"},
 		},
 		.disk_count_to_return = DEFAULT_COUNT,
-		.diskgetinfo_return_val = VBERROR_SUCCESS,
+		.diskgetinfo_return_val = VB2_SUCCESS,
 		.loadkernel_return_val = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1,},
 
 		.expected_recovery_request_val = VB2_RECOVERY_RW_NO_KERNEL,
@@ -314,7 +314,7 @@ vb2_error_t VbExDiskFreeInfo(VbDiskInfo *infos,
 	got_load_disk = (const char *)preserve_handle;
 	VB2_DEBUG("%s(): got_load_disk = %s\n", __FUNCTION__,
 		  got_load_disk ? got_load_disk : "0");
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t LoadKernel(struct vb2_context *c, LoadKernelParams *params)
diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_detach_menu_tests.c
index 37ab65ff..f1a43aa8 100644
--- a/tests/vboot_detach_menu_tests.c
+++ b/tests/vboot_detach_menu_tests.c
@@ -214,7 +214,7 @@ vb2_error_t VbDisplayScreen(struct vb2_context *c, uint32_t screen, int force,
 		screens_displayed[screens_count++] = screen;
 	printf("VbDisplayScreen: screens_displayed[%d] = 0x%x\n",
 	       screens_count - 1, screen);
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbDisplayMenu(struct vb2_context *c, uint32_t screen, int force,
@@ -229,13 +229,13 @@ vb2_error_t VbDisplayMenu(struct vb2_context *c, uint32_t screen, int force,
 	       screens_count - 1, screen,
 	       selected_index, disabled_idx_mask);
 
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbDisplayDebugInfo(struct vb2_context *c)
 {
 	debug_info_displayed = 1;
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExBeep(uint32_t msec, uint32_t frequency)
@@ -244,7 +244,7 @@ vb2_error_t VbExBeep(uint32_t msec, uint32_t frequency)
 		beeps_played[beeps_count++] = frequency;
 	printf("VbExBeep: beeps_played[%d] = %dHz for %dms\n",
 	       beeps_count - 1, frequency, msec);
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t SetVirtualDevMode(int val)
@@ -342,7 +342,7 @@ static void VbBootDevTest(void)
 	ResetMocksForDeveloper();
 	vb2_nv_set(&ctx, VB2_NV_DEV_DEFAULT_BOOT, VB2_DEV_DEFAULT_BOOT_USB);
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1);
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	TEST_EQ(VbBootDeveloperMenu(&ctx), 0, "Ctrl+U USB");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU,
 		"  warning screen");
@@ -704,8 +704,8 @@ static void VbBootDevTest(void)
 	ResetMocksForDeveloper();
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1);
 	mock_keypress[0] = VB_KEY_CTRL('U');
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS, "Ctrl+U USB");
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootDeveloperMenu(&ctx), VB2_SUCCESS, "Ctrl+U USB");
 	TEST_EQ(vbexlegacy_called, 0, "  not legacy");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
@@ -740,8 +740,8 @@ static void VbBootDevTest(void)
 	ResetMocksForDeveloper();
 	gbb.flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_USB;
 	mock_keypress[0] = VB_KEY_CTRL('U');
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS, "Ctrl+U force USB");
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootDeveloperMenu(&ctx), VB2_SUCCESS, "Ctrl+U force USB");
 	TEST_NEQ(audio_looping_calls_left, 0, "  aborts audio");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU,
 		"  warning screen");
@@ -753,8 +753,8 @@ static void VbBootDevTest(void)
 	ResetMocksForDeveloper();
 	VbApiKernelGetFwmp()->flags |= FWMP_DEV_ENABLE_USB;
 	mock_keypress[0] = VB_KEY_CTRL('U');
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS, "Ctrl+U force USB");
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootDeveloperMenu(&ctx), VB2_SUCCESS, "Ctrl+U force USB");
 	TEST_NEQ(audio_looping_calls_left, 0, "  aborts audio");
 	TEST_EQ(screens_displayed[0], VB_SCREEN_DEVELOPER_WARNING_MENU,
 		"  warning screen");
@@ -791,8 +791,8 @@ static void VbBootDevTest(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; // Boot From USB
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1);
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS,
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootDeveloperMenu(&ctx), VB2_SUCCESS,
 		"Menu selected USB boot");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
 	TEST_EQ(vbexlegacy_called, 0, "  not legacy");
@@ -825,8 +825,8 @@ static void VbBootDevTest(void)
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1);
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS,
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootDeveloperMenu(&ctx), VB2_SUCCESS,
 		"Menu selected USB default boot");
 	TEST_EQ(vbexlegacy_called, 0, "  not legacy");
 	TEST_NEQ(audio_looping_calls_left, 0, "  aborts audio");
@@ -1002,8 +1002,8 @@ static void VbBootDevTest(void)
 	ResetMocksForDeveloper();
 	vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_USB, 1);
 	mock_keypress[0] = VB_BUTTON_VOL_UP_LONG_PRESS;
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS, "VolUp USB");
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootDeveloperMenu(&ctx), VB2_SUCCESS, "VolUp USB");
 	TEST_EQ(vbexlegacy_called, 0, "  not legacy");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_NEQ(audio_looping_calls_left, 0, "  aborts audio");
@@ -1019,8 +1019,8 @@ static void VbBootDevTest(void)
 	mock_keypress[0] = VB_BUTTON_VOL_UP_LONG_PRESS;
 	mock_keypress[1] = VB_BUTTON_VOL_UP_LONG_PRESS;
 	vbtlk_retval[0] = VBERROR_SIMULATED - VB_DISK_FLAG_REMOVABLE;
-	vbtlk_retval[1] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS,
+	vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootDeveloperMenu(&ctx), VB2_SUCCESS,
 		"VolUp USB valid after invalid");
 	TEST_EQ(vbexlegacy_called, 0, "  not legacy");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
@@ -1086,8 +1086,8 @@ static void VbBootDevTest(void)
 	mock_keypress[i++] = VB_BUTTON_VOL_DOWN_SHORT_PRESS; // Language
 	mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS;
 	mock_keypress[i++] = VB_BUTTON_VOL_UP_LONG_PRESS;
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootDeveloperMenu(&ctx), VBERROR_SUCCESS,
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootDeveloperMenu(&ctx), VB2_SUCCESS,
 		"VolUp USB from LANGUAGE");
 	TEST_EQ(vbexlegacy_called, 0, "  not legacy");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
@@ -1302,9 +1302,9 @@ static void VbBootRecTest(void)
 
 	/* BROKEN screen with disks inserted */
 	ResetMocks();
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	vbtlk_retval[1] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	vbtlk_retval[2] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval[2] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[3] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
 	TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED,
 		"Shutdown requested in BROKEN with disks");
@@ -1319,7 +1319,7 @@ static void VbBootRecTest(void)
 	/* BROKEN screen with disks on second attempt */
 	ResetMocks();
 	vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
-	vbtlk_retval[1] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED,
 		"Shutdown requested in BROKEN with later disk");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
@@ -1332,9 +1332,9 @@ static void VbBootRecTest(void)
 
 	/* BROKEN screen even if dev switch is on */
 	ResetMocks();
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[1] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
-	vbtlk_retval[2] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval[2] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	shared->flags |= VBSD_BOOT_DEV_SWITCH_ON;
 	TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SHUTDOWN_REQUESTED,
 		"Shutdown requested in BROKEN with dev switch");
@@ -1403,9 +1403,9 @@ static void VbBootRecTest(void)
 
 	/* INSERT boots without screens if we have a valid image on first try */
 	ResetMocksForManualRecovery();
-	vbtlk_retval[0] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	vbtlk_retval[0] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[1] = VBERROR_SIMULATED - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SUCCESS,
+	TEST_EQ(VbBootRecoveryMenu(&ctx), VB2_SUCCESS,
 		"INSERT boots without screens if valid on first try");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1420,8 +1420,8 @@ static void VbBootRecTest(void)
 	vbtlk_retval[1] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[2] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[3] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
-	vbtlk_retval[4] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SUCCESS,
+	vbtlk_retval[4] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootRecoveryMenu(&ctx), VB2_SUCCESS,
 		"INSERT boots after valid image appears");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1438,8 +1438,8 @@ static void VbBootRecTest(void)
 	vbtlk_retval[1] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[2] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
 	vbtlk_retval[3] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
-	vbtlk_retval[4] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SUCCESS,
+	vbtlk_retval[4] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootRecoveryMenu(&ctx), VB2_SUCCESS,
 		"INSERT boots after valid image appears");
 	TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), 0, "  no recovery");
 	TEST_EQ(debug_info_displayed, 0, "  no debug info");
@@ -1827,8 +1827,8 @@ static void VbBootRecTest(void)
 	ResetMocksForManualRecovery();
 	mock_keypress[0] = VB_BUTTON_VOL_UP_SHORT_PRESS; // enter OPTIONS
 	vbtlk_retval[0] = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE;
-	vbtlk_retval[1] = VBERROR_SUCCESS - VB_DISK_FLAG_REMOVABLE;
-	TEST_EQ(VbBootRecoveryMenu(&ctx), VBERROR_SUCCESS,
+	vbtlk_retval[1] = VB2_SUCCESS - VB_DISK_FLAG_REMOVABLE;
+	TEST_EQ(VbBootRecoveryMenu(&ctx), VB2_SUCCESS,
 		"Boot by plugging in USB straight from OPTIONS menu");
 	TEST_NEQ(shutdown_request_calls_left, 0, "  booted explicitly");
 	TEST_EQ(virtdev_set, 0, "  virtual dev mode off");
diff --git a/tests/vboot_display_tests.c b/tests/vboot_display_tests.c
index 7d4662ea..b95867b4 100644
--- a/tests/vboot_display_tests.c
+++ b/tests/vboot_display_tests.c
@@ -59,7 +59,7 @@ vb2_error_t VbExGetLocalizationCount(uint32_t *count) {
 		return VBERROR_UNKNOWN;
 
 	*count = mock_localization_count;
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 uint32_t VbExGetAltFwIdxMask() {
@@ -70,7 +70,7 @@ vb2_error_t VbExDisplayDebugInfo(const char *info_str, int full_info)
 {
 	strncpy(debug_info, info_str, sizeof(debug_info));
 	debug_info[sizeof(debug_info) - 1] = '\0';
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 /* Test displaying debug info */
diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c
index ad0a9f6d..f47904a8 100644
--- a/tests/vboot_kernel_tests.c
+++ b/tests/vboot_kernel_tests.c
@@ -228,7 +228,7 @@ vb2_error_t VbExDiskRead(VbExDiskHandle_t h, uint64_t lba_start,
 	memcpy(buffer, &mock_disk[lba_start * MOCK_SECTOR_SIZE],
 	       lba_count * MOCK_SECTOR_SIZE);
 
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExDiskWrite(VbExDiskHandle_t h, uint64_t lba_start,
@@ -242,7 +242,7 @@ vb2_error_t VbExDiskWrite(VbExDiskHandle_t h, uint64_t lba_start,
 	memcpy(&mock_disk[lba_start * MOCK_SECTOR_SIZE], buffer,
 	       lba_count * MOCK_SECTOR_SIZE);
 
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 int GptInit(GptData *gpt)
diff --git a/tests/verify_kernel.c b/tests/verify_kernel.c
index 4f6f2bb3..a916f8f0 100644
--- a/tests/verify_kernel.c
+++ b/tests/verify_kernel.c
@@ -37,7 +37,7 @@ vb2_error_t VbExDiskRead(VbExDiskHandle_t handle, uint64_t lba_start,
 		return VBERROR_UNKNOWN;
 
 	memcpy(buffer, diskbuf + lba_start * 512, lba_count * 512);
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 vb2_error_t VbExDiskWrite(VbExDiskHandle_t handle, uint64_t lba_start,
@@ -51,7 +51,7 @@ vb2_error_t VbExDiskWrite(VbExDiskHandle_t handle, uint64_t lba_start,
 		return VBERROR_UNKNOWN;
 
 	memcpy(diskbuf + lba_start * 512, buffer, lba_count * 512);
-	return VBERROR_SUCCESS;
+	return VB2_SUCCESS;
 }
 
 static void print_help(const char *progname)
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 
 	/* Try loading kernel */
 	rv = LoadKernel(&ctx, &params);
-	if (rv != VBERROR_SUCCESS) {
+	if (rv != VB2_SUCCESS) {
 		fprintf(stderr, "LoadKernel() failed with code %d\n", rv);
 		return 1;
 	}