From: Quan Xu Date: Thu, 30 Apr 2015 23:43:04 +0000 (-0400) Subject: make SeaBios compatible with Xen vTPM. X-Git-Tag: rel-1.9.0~152 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=67643955c7467781c28c4da1669775d7564dc74a;p=seabios.git make SeaBios compatible with Xen vTPM. Signed-off-by: Quan Xu --- diff --git a/src/tcgbios.c b/src/tcgbios.c index c837ab6..4cda800 100644 --- a/src/tcgbios.c +++ b/src/tcgbios.c @@ -23,7 +23,7 @@ #include "std/acpi.h" // RSDP_SIGNATURE, rsdt_descriptor #include "bregs.h" // struct bregs #include "sha1.h" // sha1 - +#include "fw/paravirt.h" // runningOnXen static const u8 Startup_ST_CLEAR[2] = { 0x00, TPM_ST_CLEAR }; static const u8 Startup_ST_STATE[2] = { 0x00, TPM_ST_STATE }; @@ -494,6 +494,8 @@ tpm_start(void) return 0; tpm_acpi_init(); + if (runningOnXen()) + return 0; return tpm_startup(); }