From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Tue, 24 Oct 2017 12:20:45 +0000 (-0300)
Subject: vl: remove unnecessary #ifdef CONFIG_TPM
X-Git-Tag: v2.11.0-rc0~26^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2f0a11533352e40b222a250d1d0e5f58df86e22b;p=users%2Fdwmw2%2Fqemu.git

vl: remove unnecessary #ifdef CONFIG_TPM

a stub is now provided.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Richard W.M. Jones <rjones@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---

diff --git a/vl.c b/vl.c
index 0723835bbf..ec299099ff 100644
--- a/vl.c
+++ b/vl.c
@@ -4624,11 +4624,9 @@ int main(int argc, char **argv, char **envp)
         exit(1);
     }
 
-#ifdef CONFIG_TPM
     if (tpm_init() < 0) {
         exit(1);
     }
-#endif
 
     /* init the bluetooth world */
     if (foreach_device_config(DEV_BT, bt_parse))