| Message ID | 20210711171506.39375-1-stefanb@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, 11 Jul 2021 at 18:15, Stefan Berger <stefanb@linux.vnet.ibm.com> wrote: > > This series extends TPM-related ACPI test cases to also verify the TPM 1.2 > ACPI table 'TCPA'. > > Stefan > > The following changes since commit 9db3065c62a983286d06c207f4981408cf42184d: > > Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.1-pull-request' into staging (2021-07-08 16:30:18 +0100) > > are available in the Git repository at: > > git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2021-07-11-1 > > for you to fetch changes up to a1b5cc4a84164bc36d355853a11b706ed52bce15: > > tests: acpi: tpm1.2: Add expected TPM 1.2 ACPI blobs (2021-07-09 09:13:16 -0400) > > ---------------------------------------------------------------- > Stefan Berger (9): > tests: Rename TestState to TPMTestState > tests: Add tpm_version field to TPMTestState and fill it > tests: acpi: Prepare for renaming of TPM2 related ACPI files > tests: Add suffix 'tpm2' or 'tpm12' to ACPI table files > tests: acpi: tpm2: Add the renamed ACPI files and drop old ones > tests: tpm: Create TPM 1.2 response in TPM emulator > tests: acpi: prepare for new TPM 1.2 related tables > tests: acpi: Add test cases for TPM 1.2 with TCPA table > tests: acpi: tpm1.2: Add expected TPM 1.2 ACPI blobs Hi; this fails some of the gitlab CI jobs, specifically the build-without-default-features and build-disabled jobs: https://gitlab.com/qemu-project/qemu/-/jobs/1416896806 https://gitlab.com/qemu-project/qemu/-/jobs/1416896861 In file included from ../tests/qtest/bios-tables-test.c:65: ../tests/qtest/tpm-emu.h:41:21: error: field 'tpm_version' has incomplete type 41 | enum TPMVersion tpm_version; | ^~~~~~~~~~~ ../tests/qtest/bios-tables-test.c:1095:62: error: parameter 4 ('tpm_version') has incomplete type 1095 | uint64_t base, enum TPMVersion tpm_version) | ~~~~~~~~~~~~~~~~^~~~~~~~~~~ ../tests/qtest/bios-tables-test.c:1094:13: error: function declaration isn't a prototype [-Werror=strict-prototypes] 1094 | static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if, | ^~~~~~~~~~~~~~~~~ ../tests/qtest/bios-tables-test.c: In function 'test_acpi_q35_tcg_tpm2_tis': ../tests/qtest/bios-tables-test.c:1150:49: error: 'TPM_VERSION_2_0' undeclared (first use in this function); did you mean 'GLIB_VERSION_2_30'? 1150 | test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_2_0); | ^~~~~~~~~~~~~~~ | GLIB_VERSION_2_30 ../tests/qtest/bios-tables-test.c:1150:49: note: each undeclared identifier is reported only once for each function it appears in ../tests/qtest/bios-tables-test.c: In function 'test_acpi_q35_tcg_tpm12_tis': ../tests/qtest/bios-tables-test.c:1155:49: error: 'TPM_VERSION_1_2' undeclared (first use in this function); did you mean 'GLIB_VERSION_2_26'? 1155 | test_acpi_tcg_tpm("q35", "tis", 0xFED40000, TPM_VERSION_1_2); | ^~~~~~~~~~~~~~~ | GLIB_VERSION_2_26 cc1: all warnings being treated as errors etc Perhaps the tests meson.build is not disabling building of TPM-related parts of the tests when TPM is disabled ? thanks -- PMM
This series extends TPM-related ACPI test cases to also verify the TPM 1.2 ACPI table 'TCPA'. Stefan The following changes since commit 9db3065c62a983286d06c207f4981408cf42184d: Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.1-pull-request' into staging (2021-07-08 16:30:18 +0100) are available in the Git repository at: git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2021-07-11-1 for you to fetch changes up to a1b5cc4a84164bc36d355853a11b706ed52bce15: tests: acpi: tpm1.2: Add expected TPM 1.2 ACPI blobs (2021-07-09 09:13:16 -0400) ---------------------------------------------------------------- Stefan Berger (9): tests: Rename TestState to TPMTestState tests: Add tpm_version field to TPMTestState and fill it tests: acpi: Prepare for renaming of TPM2 related ACPI files tests: Add suffix 'tpm2' or 'tpm12' to ACPI table files tests: acpi: tpm2: Add the renamed ACPI files and drop old ones tests: tpm: Create TPM 1.2 response in TPM emulator tests: acpi: prepare for new TPM 1.2 related tables tests: acpi: Add test cases for TPM 1.2 with TCPA table tests: acpi: tpm1.2: Add expected TPM 1.2 ACPI blobs tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 0 -> 8465 bytes tests/data/acpi/q35/{DSDT.tis => DSDT.tis.tpm2} | Bin tests/data/acpi/q35/TCPA.tis.tpm12 | Bin 0 -> 50 bytes tests/data/acpi/q35/{TPM2.tis => TPM2.tis.tpm2} | Bin tests/qtest/bios-tables-test.c | 20 ++++++++++++++------ tests/qtest/tpm-crb-test.c | 5 +++-- tests/qtest/tpm-emu.c | 24 ++++++++++++++++++------ tests/qtest/tpm-emu.h | 11 ++++++++--- tests/qtest/tpm-tis-device-test.c | 3 ++- tests/qtest/tpm-tis-test.c | 3 ++- tests/qtest/tpm-tis-util.c | 2 +- 11 files changed, 48 insertions(+), 20 deletions(-) create mode 100644 tests/data/acpi/q35/DSDT.tis.tpm12 rename tests/data/acpi/q35/{DSDT.tis => DSDT.tis.tpm2} (100%) create mode 100644 tests/data/acpi/q35/TCPA.tis.tpm12 rename tests/data/acpi/q35/{TPM2.tis => TPM2.tis.tpm2} (100%)