diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-12-11 12:16:33 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-12-11 12:16:33 +0000 |
| commit | 33744604d768e4281d425baa3ce7128b91319503 (patch) | |
| tree | 5e5a4aa377ac64d3701e9764db78d8c0b5057ed4 /include/sysemu | |
| parent | 2ecfc0657afa5d29a373271b342f704a1a3c6737 (diff) | |
| parent | d1615ea575b08fc96aeeb2630c40c5e51364b95c (diff) | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
Machine queue, 2020-12-10
Some patches that were queued after 5.2 soft freeze.
# gpg: Signature made Thu 10 Dec 2020 22:41:29 GMT
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-next-pull-request:
i386/cpu: Make the Intel PT LIP feature configurable
sev: add sev-inject-launch-secret
qom: code hardening - have bound checking while looping with integer value
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/sysemu')
| -rw-r--r-- | include/sysemu/sev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h index 98c1ec8d38..7ab6e3e31d 100644 --- a/include/sysemu/sev.h +++ b/include/sysemu/sev.h @@ -18,4 +18,6 @@ void *sev_guest_init(const char *id); int sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t len); +int sev_inject_launch_secret(const char *hdr, const char *secret, + uint64_t gpa, Error **errp); #endif |