diff options
| author | Peter Maydell | 2018-02-05 10:31:37 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-02-05 10:31:37 +0100 |
| commit | 2b3805f370521deacab974b9c9ca07d2319a8890 (patch) | |
| tree | 65c916774a544ba8f6d866b823e242db2ccbf5f8 /hw/tpm/tpm_util.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180202-pull-request' i... (diff) | |
| parent | tpm: tis: move one-line function into caller (diff) | |
| download | qemu-2b3805f370521deacab974b9c9ca07d2319a8890.tar.gz qemu-2b3805f370521deacab974b9c9ca07d2319a8890.tar.xz qemu-2b3805f370521deacab974b9c9ca07d2319a8890.zip | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-02-03-1' into staging
Merge tpm 2018/02/03 v1
# gpg: Signature made Sat 03 Feb 2018 14:02:35 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-02-03-1:
tpm: tis: move one-line function into caller
MAINTAINERS: add pointer to tpm-next repository
tpm: wrap stX_be_p in tpm_cmd_set_XYZ functions
tpm: Split off tpm_crb_reset function
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/tpm/tpm_util.c')
| -rw-r--r-- | hw/tpm/tpm_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c index 8abde59915..2de52a0f1b 100644 --- a/hw/tpm/tpm_util.c +++ b/hw/tpm/tpm_util.c @@ -106,9 +106,9 @@ const PropertyInfo qdev_prop_tpm = { void tpm_util_write_fatal_error_response(uint8_t *out, uint32_t out_len) { if (out_len >= sizeof(struct tpm_resp_hdr)) { - stw_be_p(out, TPM_TAG_RSP_COMMAND); - stl_be_p(out + 2, sizeof(struct tpm_resp_hdr)); - stl_be_p(out + 6, TPM_FAIL); + tpm_cmd_set_tag(out, TPM_TAG_RSP_COMMAND); + tpm_cmd_set_size(out, sizeof(struct tpm_resp_hdr)); + tpm_cmd_set_error(out, TPM_FAIL); } } |