From: Juan Quintela <quintela@redhat.com>
Date: Tue, 2 Jun 2015 13:47:20 +0000 (+0200)
Subject: TPM: fix build with tpm disabled
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=977ad992f14b29a7d4f18eaba42a705004545a64;p=qemu.git

TPM: fix build with tpm disabled

Failure was included on commit

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index c1438907de..c8afa179e5 100644
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -32,11 +32,13 @@ TPMVersion tpm_tis_get_tpm_version(Object *obj);
 
 static inline TPMVersion tpm_get_version(void)
 {
+#ifdef CONFIG_TPM
     Object *obj = object_resolve_path_type("", TYPE_TPM_TIS, NULL);
 
     if (obj) {
         return tpm_tis_get_tpm_version(obj);
     }
+#endif
     return TPM_VERSION_UNSPEC;
 }