[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 10/10] tests: Use QMP to check whether a TPM device model is a
From: |
Stefan Berger |
Subject: |
[PATCH v4 10/10] tests: Use QMP to check whether a TPM device model is available |
Date: |
Mon, 12 Jul 2021 16:47:36 -0400 |
Use QMP to check whether a given TPM device model is available
and if it is not the case then skip a test that requires it.
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
tests/qtest/bios-tables-test.c | 14 +++++++------
tests/qtest/tpm-emu.c | 37 ++++++++++++++++++++++++++++++++++
tests/qtest/tpm-emu.h | 2 ++
3 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index ddfd2d2b2a..64add7da72 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1094,7 +1094,6 @@ uint64_t tpm_tis_base_addr;
static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,
uint64_t base, enum TPMVersion tpm_version)
{
-#ifdef CONFIG_TPM
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);
@@ -1140,19 +1139,22 @@ static void test_acpi_tcg_tpm(const char *machine,
const char *tpm_if,
g_free(tmp_dir_name);
g_free(args);
free_test_data(&data);
-#else
- g_test_skip("TPM disabled");
-#endif
}
static void test_acpi_q35_tcg_tpm2_tis(void)
{
- test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_2_0);
+ if (!tpm_model_is_available("-machine q35", "tpm-tis"))
+ g_test_skip("TPM disabled");
+ else
+ test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_2_0);
}
static void test_acpi_q35_tcg_tpm12_tis(void)
{
- test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_1_2);
+ if (!tpm_model_is_available("-machine q35", "tpm-tis"))
+ g_test_skip("TPM disabled");
+ else
+ test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_1_2);
}
static void test_acpi_tcg_dimm_pxm(const char *machine)
diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c
index 32c704194b..553f1ad4ee 100644
--- a/tests/qtest/tpm-emu.c
+++ b/tests/qtest/tpm-emu.c
@@ -16,6 +16,8 @@
#include "backends/tpm/tpm_ioctl.h"
#include "io/channel-socket.h"
#include "qapi/error.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qstring.h"
#include "tpm-emu.h"
void tpm_emu_test_wait_cond(TPMTestState *s)
@@ -192,3 +194,38 @@ void *tpm_emu_ctrl_thread(void *data)
object_unref(OBJECT(lioc));
return NULL;
}
+
+bool tpm_model_is_available(const char *args, const char *tpm_if)
+{
+ QTestState *qts;
+ QDict *rsp_tpm;
+ bool ret = false;
+
+ qts = qtest_init(args);
+ if (!qts)
+ return false;
+
+ rsp_tpm = qtest_qmp(qts, "{ 'execute': 'query-tpm'}");
+ if (!qdict_haskey(rsp_tpm, "error")) {
+ QDict *rsp_models = qtest_qmp(qts,
+ "{ 'execute': 'query-tpm-models'}");
+ if (qdict_haskey(rsp_models, "return")) {
+ QList *models = qdict_get_qlist(rsp_models, "return");
+ QListEntry *e;
+
+ QLIST_FOREACH_ENTRY(models, e) {
+ QString *s = qobject_to(QString, qlist_entry_obj(e));
+ const char *ename = qstring_get_str(s);
+ if (!strcmp(ename, tpm_if)) {
+ ret = true;
+ }
+ }
+ qobject_unref(models);
+ }
+ qobject_unref(rsp_models);
+ }
+ qobject_unref(rsp_tpm);
+ qtest_quit(qts);
+
+ return ret;
+}
diff --git a/tests/qtest/tpm-emu.h b/tests/qtest/tpm-emu.h
index fcb5d7a1d6..c33d99af37 100644
--- a/tests/qtest/tpm-emu.h
+++ b/tests/qtest/tpm-emu.h
@@ -22,6 +22,7 @@
#include "qemu/sockets.h"
#include "io/channel.h"
#include "sysemu/tpm.h"
+#include "libqos/libqtest.h"
struct tpm_hdr {
uint16_t tag;
@@ -50,5 +51,6 @@ typedef struct TPMTestState {
void tpm_emu_test_wait_cond(TPMTestState *s);
void *tpm_emu_ctrl_thread(void *data);
+bool tpm_model_is_available(const char *args, const char *tpm_if);
#endif /* TESTS_TPM_EMU_H */
--
2.31.1
- [PATCH v4 00/10] tests: Add test cases for TPM 1.2 ACPI tables, Stefan Berger, 2021/07/12
- [PATCH v4 01/10] tests: Rename TestState to TPMTestState, Stefan Berger, 2021/07/12
- [PATCH v4 06/10] tests: tpm: Create TPM 1.2 response in TPM emulator, Stefan Berger, 2021/07/12
- [PATCH v4 02/10] tests: Add tpm_version field to TPMTestState and fill it, Stefan Berger, 2021/07/12
- [PATCH v4 07/10] tests: acpi: prepare for new TPM 1.2 related tables, Stefan Berger, 2021/07/12
- [PATCH v4 04/10] tests: Add suffix 'tpm2' or 'tpm12' to ACPI table files, Stefan Berger, 2021/07/12
- [PATCH v4 05/10] tests: acpi: tpm2: Add the renamed ACPI files and drop old ones, Stefan Berger, 2021/07/12
- [PATCH v4 03/10] tests: acpi: Prepare for renaming of TPM2 related ACPI files, Stefan Berger, 2021/07/12
- [PATCH v4 09/10] tests: acpi: tpm1.2: Add expected TPM 1.2 ACPI blobs, Stefan Berger, 2021/07/12
- [PATCH v4 08/10] tests: acpi: Add test cases for TPM 1.2 with TCPA table, Stefan Berger, 2021/07/12
- [PATCH v4 10/10] tests: Use QMP to check whether a TPM device model is available,
Stefan Berger <=
- Re: [PATCH v4 00/10] tests: Add test cases for TPM 1.2 ACPI tables, Michael S. Tsirkin, 2021/07/13