diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-01 12:08:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-01 12:08:10 +0000 |
| commit | 8002fa2bf6d3eddc0b73f8a0b64ac6b3ad1defab (patch) | |
| tree | 3975471c7cb496ae46af70387afa814bf170318f /tests/tpm-util.h | |
| parent | 7d51a855cd568ec3399a1834ada4023cfa12f231 (diff) | |
| parent | eff1fe9fd0cebe2293eea9597616f792b6b5ad18 (diff) | |
| download | focaccia-qemu-8002fa2bf6d3eddc0b73f8a0b64ac6b3ad1defab.tar.gz focaccia-qemu-8002fa2bf6d3eddc0b73f8a0b64ac6b3ad1defab.zip | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-10-29-2' into staging
Merge tpm 2018/10/29 v2 # gpg: Signature made Tue 30 Oct 2018 21:40:24 GMT # gpg: using RSA key 75AD65802A0B4211 # gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211 * remotes/stefanberger/tags/pull-tpm-2018-10-29-2: tpm: Zero-init structure to avoid uninitialized variables in valgrind log MAINTAINERS: Change my email address to the new domain docs: tpm: Mention implemented TPM CRB interface emulation and specs tests/tpm: Display if swtpm is not found or --tpm2 not supported tests/tpm: fix tpm_util_swtpm_has_tpm2() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/tpm-util.h')
| -rw-r--r-- | tests/tpm-util.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/tpm-util.h b/tests/tpm-util.h index 330b9657fe..9e98bc5124 100644 --- a/tests/tpm-util.h +++ b/tests/tpm-util.h @@ -32,6 +32,8 @@ void tpm_util_pcrextend(QTestState *s, tx_func *tx); void tpm_util_pcrread(QTestState *s, tx_func *tx, const unsigned char *exp_resp, size_t exp_resp_size); +bool tpm_util_swtpm_has_tpm2(void); + gboolean tpm_util_swtpm_start(const char *path, GPid *pid, SocketAddress **addr, GError **error); void tpm_util_swtpm_kill(GPid pid); |