Message ID | 20210630153723.672473-2-stefanb@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | tests: Add test cases for TPM 1.2 ACPI tables | expand |
On Wed, 30 Jun 2021 11:37:17 -0400 Stefan Berger <stefanb@linux.vnet.ibm.com> wrote: > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > tests/qtest/bios-tables-test.c | 2 +- > tests/qtest/tpm-crb-test.c | 4 ++-- > tests/qtest/tpm-emu.c | 6 +++--- > tests/qtest/tpm-emu.h | 6 +++--- > tests/qtest/tpm-tis-device-test.c | 2 +- > tests/qtest/tpm-tis-test.c | 2 +- > tests/qtest/tpm-tis-util.c | 2 +- > 7 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c > index 51d3a4e239..a622f91a37 100644 > --- a/tests/qtest/bios-tables-test.c > +++ b/tests/qtest/bios-tables-test.c > @@ -1098,7 +1098,7 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if, > gchar *tmp_dir_name = g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXXXX", > machine, tpm_if); > char *tmp_path = g_dir_make_tmp(tmp_dir_name, NULL); > - TestState test; > + TPMTestState test; > test_data data; > GThread *thread; > char *args, *variant = g_strdup_printf(".%s", tpm_if); > diff --git a/tests/qtest/tpm-crb-test.c b/tests/qtest/tpm-crb-test.c > index ed533900d1..50936f1482 100644 > --- a/tests/qtest/tpm-crb-test.c > +++ b/tests/qtest/tpm-crb-test.c > @@ -26,7 +26,7 @@ uint64_t tpm_tis_base_addr = TPM_TIS_ADDR_BASE; > > static void tpm_crb_test(const void *data) > { > - const TestState *s = data; > + const TPMTestState *s = data; > uint32_t intfid = readl(TPM_CRB_ADDR_BASE + A_CRB_INTF_ID); > uint32_t csize = readl(TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_SIZE); > uint64_t caddr = readq(TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_LADDR); > @@ -145,7 +145,7 @@ int main(int argc, char **argv) > int ret; > char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-crb-test.XXXXXX", NULL); > GThread *thread; > - TestState test; > + TPMTestState test; > > module_call_init(MODULE_INIT_QOM); > g_test_init(&argc, &argv, NULL); > diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c > index 2e8eb7b94f..b9cddcc240 100644 > --- a/tests/qtest/tpm-emu.c > +++ b/tests/qtest/tpm-emu.c > @@ -18,7 +18,7 @@ > #include "qapi/error.h" > #include "tpm-emu.h" > > -void tpm_emu_test_wait_cond(TestState *s) > +void tpm_emu_test_wait_cond(TPMTestState *s) > { > gint64 end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; > > @@ -36,7 +36,7 @@ void tpm_emu_test_wait_cond(TestState *s) > > static void *tpm_emu_tpm_thread(void *data) > { > - TestState *s = data; > + TPMTestState *s = data; > QIOChannel *ioc = s->tpm_ioc; > > s->tpm_msg = g_new(struct tpm_hdr, 1); > @@ -71,7 +71,7 @@ static void *tpm_emu_tpm_thread(void *data) > > void *tpm_emu_ctrl_thread(void *data) > { > - TestState *s = data; > + TPMTestState *s = data; > QIOChannelSocket *lioc = qio_channel_socket_new(); > QIOChannel *ioc; > > diff --git a/tests/qtest/tpm-emu.h b/tests/qtest/tpm-emu.h > index 73f3bed0c4..b066ad63fb 100644 > --- a/tests/qtest/tpm-emu.h > +++ b/tests/qtest/tpm-emu.h > @@ -26,7 +26,7 @@ struct tpm_hdr { > char buffer[]; > } QEMU_PACKED; > > -typedef struct TestState { > +typedef struct TPMTestState { > GMutex data_mutex; > GCond data_cond; > bool data_cond_signal; > @@ -34,9 +34,9 @@ typedef struct TestState { > QIOChannel *tpm_ioc; > GThread *emu_tpm_thread; > struct tpm_hdr *tpm_msg; > -} TestState; > +} TPMTestState; > > -void tpm_emu_test_wait_cond(TestState *s); > +void tpm_emu_test_wait_cond(TPMTestState *s); > void *tpm_emu_ctrl_thread(void *data); > > #endif /* TESTS_TPM_EMU_H */ > diff --git a/tests/qtest/tpm-tis-device-test.c b/tests/qtest/tpm-tis-device-test.c > index 63ed36440f..d36ae20243 100644 > --- a/tests/qtest/tpm-tis-device-test.c > +++ b/tests/qtest/tpm-tis-device-test.c > @@ -33,7 +33,7 @@ int main(int argc, char **argv) > { > char *tmp_path = g_dir_make_tmp("qemu-tpm-tis-device-test.XXXXXX", NULL); > GThread *thread; > - TestState test; > + TPMTestState test; > char *args; > int ret; > > diff --git a/tests/qtest/tpm-tis-test.c b/tests/qtest/tpm-tis-test.c > index 79ffbc943e..6fee4779ea 100644 > --- a/tests/qtest/tpm-tis-test.c > +++ b/tests/qtest/tpm-tis-test.c > @@ -29,7 +29,7 @@ int main(int argc, char **argv) > int ret; > char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-tis-test.XXXXXX", NULL); > GThread *thread; > - TestState test; > + TPMTestState test; > > module_call_init(MODULE_INIT_QOM); > g_test_init(&argc, &argv, NULL); > diff --git a/tests/qtest/tpm-tis-util.c b/tests/qtest/tpm-tis-util.c > index 9aff503fd8..939893bf01 100644 > --- a/tests/qtest/tpm-tis-util.c > +++ b/tests/qtest/tpm-tis-util.c > @@ -373,7 +373,7 @@ void tpm_tis_test_check_access_reg_release(const void *data) > */ > void tpm_tis_test_check_transmit(const void *data) > { > - const TestState *s = data; > + const TPMTestState *s = data; > uint8_t access; > uint32_t sts; > uint16_t bcount;
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 51d3a4e239..a622f91a37 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1098,7 +1098,7 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if, gchar *tmp_dir_name = g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXXXX", machine, tpm_if); char *tmp_path = g_dir_make_tmp(tmp_dir_name, NULL); - TestState test; + TPMTestState test; test_data data; GThread *thread; char *args, *variant = g_strdup_printf(".%s", tpm_if); diff --git a/tests/qtest/tpm-crb-test.c b/tests/qtest/tpm-crb-test.c index ed533900d1..50936f1482 100644 --- a/tests/qtest/tpm-crb-test.c +++ b/tests/qtest/tpm-crb-test.c @@ -26,7 +26,7 @@ uint64_t tpm_tis_base_addr = TPM_TIS_ADDR_BASE; static void tpm_crb_test(const void *data) { - const TestState *s = data; + const TPMTestState *s = data; uint32_t intfid = readl(TPM_CRB_ADDR_BASE + A_CRB_INTF_ID); uint32_t csize = readl(TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_SIZE); uint64_t caddr = readq(TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_LADDR); @@ -145,7 +145,7 @@ int main(int argc, char **argv) int ret; char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-crb-test.XXXXXX", NULL); GThread *thread; - TestState test; + TPMTestState test; module_call_init(MODULE_INIT_QOM); g_test_init(&argc, &argv, NULL); diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c index 2e8eb7b94f..b9cddcc240 100644 --- a/tests/qtest/tpm-emu.c +++ b/tests/qtest/tpm-emu.c @@ -18,7 +18,7 @@ #include "qapi/error.h" #include "tpm-emu.h" -void tpm_emu_test_wait_cond(TestState *s) +void tpm_emu_test_wait_cond(TPMTestState *s) { gint64 end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND; @@ -36,7 +36,7 @@ void tpm_emu_test_wait_cond(TestState *s) static void *tpm_emu_tpm_thread(void *data) { - TestState *s = data; + TPMTestState *s = data; QIOChannel *ioc = s->tpm_ioc; s->tpm_msg = g_new(struct tpm_hdr, 1); @@ -71,7 +71,7 @@ static void *tpm_emu_tpm_thread(void *data) void *tpm_emu_ctrl_thread(void *data) { - TestState *s = data; + TPMTestState *s = data; QIOChannelSocket *lioc = qio_channel_socket_new(); QIOChannel *ioc; diff --git a/tests/qtest/tpm-emu.h b/tests/qtest/tpm-emu.h index 73f3bed0c4..b066ad63fb 100644 --- a/tests/qtest/tpm-emu.h +++ b/tests/qtest/tpm-emu.h @@ -26,7 +26,7 @@ struct tpm_hdr { char buffer[]; } QEMU_PACKED; -typedef struct TestState { +typedef struct TPMTestState { GMutex data_mutex; GCond data_cond; bool data_cond_signal; @@ -34,9 +34,9 @@ typedef struct TestState { QIOChannel *tpm_ioc; GThread *emu_tpm_thread; struct tpm_hdr *tpm_msg; -} TestState; +} TPMTestState; -void tpm_emu_test_wait_cond(TestState *s); +void tpm_emu_test_wait_cond(TPMTestState *s); void *tpm_emu_ctrl_thread(void *data); #endif /* TESTS_TPM_EMU_H */ diff --git a/tests/qtest/tpm-tis-device-test.c b/tests/qtest/tpm-tis-device-test.c index 63ed36440f..d36ae20243 100644 --- a/tests/qtest/tpm-tis-device-test.c +++ b/tests/qtest/tpm-tis-device-test.c @@ -33,7 +33,7 @@ int main(int argc, char **argv) { char *tmp_path = g_dir_make_tmp("qemu-tpm-tis-device-test.XXXXXX", NULL); GThread *thread; - TestState test; + TPMTestState test; char *args; int ret; diff --git a/tests/qtest/tpm-tis-test.c b/tests/qtest/tpm-tis-test.c index 79ffbc943e..6fee4779ea 100644 --- a/tests/qtest/tpm-tis-test.c +++ b/tests/qtest/tpm-tis-test.c @@ -29,7 +29,7 @@ int main(int argc, char **argv) int ret; char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-tis-test.XXXXXX", NULL); GThread *thread; - TestState test; + TPMTestState test; module_call_init(MODULE_INIT_QOM); g_test_init(&argc, &argv, NULL); diff --git a/tests/qtest/tpm-tis-util.c b/tests/qtest/tpm-tis-util.c index 9aff503fd8..939893bf01 100644 --- a/tests/qtest/tpm-tis-util.c +++ b/tests/qtest/tpm-tis-util.c @@ -373,7 +373,7 @@ void tpm_tis_test_check_access_reg_release(const void *data) */ void tpm_tis_test_check_transmit(const void *data) { - const TestState *s = data; + const TPMTestState *s = data; uint8_t access; uint32_t sts; uint16_t bcount;
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> --- tests/qtest/bios-tables-test.c | 2 +- tests/qtest/tpm-crb-test.c | 4 ++-- tests/qtest/tpm-emu.c | 6 +++--- tests/qtest/tpm-emu.h | 6 +++--- tests/qtest/tpm-tis-device-test.c | 2 +- tests/qtest/tpm-tis-test.c | 2 +- tests/qtest/tpm-tis-util.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-)