motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Rename TestState to TPMTestState

Browse source 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-2-stefanb@linux.ibm.com
This commit is contained in:
Stefan Berger 2021-08-02 17:52:37 -04:00
parent d52dff5d80
commit 9bd0e32a19
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/qtest/bios-tables-test.c
View file

@ -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", gchar *tmp_dir_name = g_strdup_printf("qemu-test_acpi_%s_tcg_%s.XXXXXX",
machine, tpm_if); machine, tpm_if);
char *tmp_path = g_dir_make_tmp(tmp_dir_name, NULL); char *tmp_path = g_dir_make_tmp(tmp_dir_name, NULL);
TestState test; TPMTestState test;
test_data data; test_data data;
GThread *thread; GThread *thread;
char *args, *variant = g_strdup_printf(".%s", tpm_if); char *args, *variant = g_strdup_printf(".%s", tpm_if);

4
tests/qtest/tpm-crb-test.c
View file

@ -26,7 +26,7 @@ uint64_t tpm_tis_base_addr = TPM_TIS_ADDR_BASE;
static void tpm_crb_test(const void *data) 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 intfid = readl(TPM_CRB_ADDR_BASE + A_CRB_INTF_ID);
uint32_t csize = readl(TPM_CRB_ADDR_BASE + A_CRB_CTRL_CMD_SIZE); 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); 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; int ret;
char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-crb-test.XXXXXX", NULL); char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-crb-test.XXXXXX", NULL);
GThread *thread; GThread *thread;
TestState test; TPMTestState test;
module_call_init(MODULE_INIT_QOM); module_call_init(MODULE_INIT_QOM);
g_test_init(&argc, &argv, NULL); g_test_init(&argc, &argv, NULL);

6
tests/qtest/tpm-emu.c
View file

@ -18,7 +18,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "tpm-emu.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; 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) static void *tpm_emu_tpm_thread(void *data)
{ {
TestState *s = data; TPMTestState *s = data;
QIOChannel *ioc = s->tpm_ioc; QIOChannel *ioc = s->tpm_ioc;
s->tpm_msg = g_new(struct tpm_hdr, 1); 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) void *tpm_emu_ctrl_thread(void *data)
{ {
TestState *s = data; TPMTestState *s = data;
QIOChannelSocket *lioc = qio_channel_socket_new(); QIOChannelSocket *lioc = qio_channel_socket_new();
QIOChannel *ioc; QIOChannel *ioc;

6
tests/qtest/tpm-emu.h
View file

@ -26,7 +26,7 @@ struct tpm_hdr {
char buffer[]; char buffer[];
} QEMU_PACKED; } QEMU_PACKED;
typedef struct TestState { typedef struct TPMTestState {
GMutex data_mutex; GMutex data_mutex;
GCond data_cond; GCond data_cond;
bool data_cond_signal; bool data_cond_signal;
@ -34,9 +34,9 @@ typedef struct TestState {
QIOChannel *tpm_ioc; QIOChannel *tpm_ioc;
GThread *emu_tpm_thread; GThread *emu_tpm_thread;
struct tpm_hdr *tpm_msg; 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); void *tpm_emu_ctrl_thread(void *data);
#endif /* TESTS_TPM_EMU_H */ #endif /* TESTS_TPM_EMU_H */

2
tests/qtest/tpm-tis-device-test.c
View file

@ -33,7 +33,7 @@ int main(int argc, char **argv)
{ {
char *tmp_path = g_dir_make_tmp("qemu-tpm-tis-device-test.XXXXXX", NULL); char *tmp_path = g_dir_make_tmp("qemu-tpm-tis-device-test.XXXXXX", NULL);
GThread *thread; GThread *thread;
TestState test; TPMTestState test;
char *args; char *args;
int ret; int ret;

2
tests/qtest/tpm-tis-test.c
View file

@ -29,7 +29,7 @@ int main(int argc, char **argv)
int ret; int ret;
char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-tis-test.XXXXXX", NULL); char *args, *tmp_path = g_dir_make_tmp("qemu-tpm-tis-test.XXXXXX", NULL);
GThread *thread; GThread *thread;
TestState test; TPMTestState test;
module_call_init(MODULE_INIT_QOM); module_call_init(MODULE_INIT_QOM);
g_test_init(&argc, &argv, NULL); g_test_init(&argc, &argv, NULL);

2
tests/qtest/tpm-tis-util.c
View file

@ -373,7 +373,7 @@ void tpm_tis_test_check_access_reg_release(const void *data)
*/ */
void tpm_tis_test_check_transmit(const void *data) void tpm_tis_test_check_transmit(const void *data)
{ {
const TestState *s = data; const TPMTestState *s = data;
uint8_t access; uint8_t access;
uint32_t sts; uint32_t sts;
uint16_t bcount; uint16_t bcount;