[REFACTOR] Re-index secondary VM names in unit tests to start at 1
VM ID 0 is used for the primary VM. Therefore, it can be ambiguous to refer to
secondary VMs starting at 0 (e.g., SERVICE_VM0).
Change-Id: I3c6454ce0fb5687ce865e2d8a21255c6ae0c46a2
diff --git a/test/vmapi/primary_with_secondaries/floating_point.c b/test/vmapi/primary_with_secondaries/floating_point.c
index 23660ce..88656e4 100644
--- a/test/vmapi/primary_with_secondaries/floating_point.c
+++ b/test/vmapi/primary_with_secondaries/floating_point.c
@@ -39,13 +39,13 @@
struct mailbox_buffers mb = set_up_mailbox();
fill_fp_registers(first);
- SERVICE_SELECT(SERVICE_VM0, "fp_fill", mb.send);
- run_res = spci_run(SERVICE_VM0, 0);
+ SERVICE_SELECT(SERVICE_VM1, "fp_fill", mb.send);
+ run_res = spci_run(SERVICE_VM1, 0);
EXPECT_EQ(run_res.func, SPCI_YIELD_32);
EXPECT_EQ(check_fp_register(first), true);
fill_fp_registers(second);
- run_res = spci_run(SERVICE_VM0, 0);
+ run_res = spci_run(SERVICE_VM1, 0);
EXPECT_EQ(run_res.func, SPCI_YIELD_32);
EXPECT_EQ(check_fp_register(second), true);
}
@@ -62,12 +62,12 @@
EXPECT_EQ(read_msr(fpcr), value);
- SERVICE_SELECT(SERVICE_VM0, "fp_fpcr", mb.send);
- run_res = spci_run(SERVICE_VM0, 0);
+ SERVICE_SELECT(SERVICE_VM1, "fp_fpcr", mb.send);
+ run_res = spci_run(SERVICE_VM1, 0);
EXPECT_EQ(run_res.func, SPCI_YIELD_32);
EXPECT_EQ(read_msr(fpcr), value);
- run_res = spci_run(SERVICE_VM0, 0);
+ run_res = spci_run(SERVICE_VM1, 0);
EXPECT_EQ(run_res.func, SPCI_YIELD_32);
EXPECT_EQ(read_msr(fpcr), value);
}