From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0T2e-0004Kk-C8 for qemu-devel@nongnu.org; Thu, 04 Jun 2015 07:10:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0T2Z-0001ar-98 for qemu-devel@nongnu.org; Thu, 04 Jun 2015 07:10:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0T2Y-0001ab-S8 for qemu-devel@nongnu.org; Thu, 04 Jun 2015 07:10:26 -0400 Date: Thu, 4 Jun 2015 13:10:23 +0200 From: "Michael S. Tsirkin" Message-ID: <1433416111-19022-5-git-send-email-mst@redhat.com> References: <1433416111-19022-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433416111-19022-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 04/28] TPM: fix build with tpm disabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Berger , Eduardo Habkost , Juan Quintela From: Juan Quintela Failure was included on commit Signed-off-by: Juan Quintela Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/sysemu/tpm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index c143890..c8afa17 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; } -- MST