Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
roms
/
seabios
/
src
/
resume.c
diff --git
a/qemu/roms/seabios/src/resume.c
b/qemu/roms/seabios/src/resume.c
index
1903174
..
a5465d8
100644
(file)
--- a/
qemu/roms/seabios/src/resume.c
+++ b/
qemu/roms/seabios/src/resume.c
@@
-16,6
+16,7
@@
#include "std/bda.h" // struct bios_data_area_s
#include "string.h" // memset
#include "util.h" // dma_setup
#include "std/bda.h" // struct bios_data_area_s
#include "string.h" // memset
#include "util.h" // dma_setup
+#include "tcgbios.h" // tpm_s3_resume
// Handler for post calls that look like a resume.
void VISIBLE16
// Handler for post calls that look like a resume.
void VISIBLE16
@@
-99,6
+100,8
@@
s3_resume(void)
pci_resume();
pci_resume();
+ /* resume TPM before we may measure option roms */
+ tpm_s3_resume();
s3_resume_vga();
make_bios_readonly();
s3_resume_vga();
make_bios_readonly();