From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yzqir-0004GO-76 for qemu-devel@nongnu.org; Tue, 02 Jun 2015 14:15:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yzqin-0000C2-51 for qemu-devel@nongnu.org; Tue, 02 Jun 2015 14:15:33 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:51516) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzqZ9-0004yV-AX for qemu-devel@nongnu.org; Tue, 02 Jun 2015 14:05:31 -0400 Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 2 Jun 2015 12:05:29 -0600 Received: from b03cxnp07028.gho.boulder.ibm.com (b03cxnp07028.gho.boulder.ibm.com [9.17.130.15]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id B3A7219D8042 for ; Tue, 2 Jun 2015 11:56:29 -0600 (MDT) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t52I3D1731588368 for ; Tue, 2 Jun 2015 11:03:13 -0700 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t52I5QU8003148 for ; Tue, 2 Jun 2015 12:05:27 -0600 From: Stefan Berger Date: Tue, 2 Jun 2015 14:05:22 -0400 Message-Id: <1433268322-1290277-1-git-send-email-stefanb@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] tpm: Prevent a call to TPM if no TPM support is requested List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mst@redhat.com Cc: peter.maydell@linaro.org, Stefan Berger , stefanb@us.ibm.com, quintela@redhat.com Prevent the function tpm_tis_get_tpm_version() from being called if not TPM support is requested. Signed-off-by: Stefan Berger --- 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; } -- 1.9.3