From nobody Tue Feb 10 20:28:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507591369904885.9172442363123; Mon, 9 Oct 2017 16:22:49 -0700 (PDT) Received: from localhost ([::1]:60243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1hNg-0002Ff-7o for importer@patchew.org; Mon, 09 Oct 2017 19:22:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1h0V-000791-Le for qemu-devel@nongnu.org; Mon, 09 Oct 2017 18:58:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1h0U-0005fd-Pm for qemu-devel@nongnu.org; Mon, 09 Oct 2017 18:58:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55616) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1h0U-0005fI-JK for qemu-devel@nongnu.org; Mon, 09 Oct 2017 18:58:42 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8ACEA883C5; Mon, 9 Oct 2017 22:58:41 +0000 (UTC) Received: from localhost (unknown [10.36.112.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id A399877713; Mon, 9 Oct 2017 22:58:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8ACEA883C5 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 10 Oct 2017 00:56:19 +0200 Message-Id: <20171009225623.29232-39-marcandre.lureau@redhat.com> In-Reply-To: <20171009225623.29232-1-marcandre.lureau@redhat.com> References: <20171009225623.29232-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 09 Oct 2017 22:58:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 38/42] tpm: add TPM interface to lookup TPM version X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , amarnath.valluri@intel.com, stefanb@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Do not hardcode TPM device model to lookup version, use an interface instead. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefan Berger --- include/sysemu/tpm.h | 5 ++--- hw/tpm/tpm_tis.c | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index dbd2b0cc7a..9439330cf1 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -38,6 +38,7 @@ typedef struct TPMIfClass { =20 enum TpmModel model; void (*request_completed)(TPMIf *obj); + enum TPMVersion (*get_version)(TPMIf *obj); } TPMIfClass; =20 int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); @@ -53,15 +54,13 @@ static inline TPMIf *tpm_find(void) return TPM_IF(obj); } =20 -TPMVersion tpm_tis_get_tpm_version(Object *obj); - static inline TPMVersion tpm_get_version(TPMIf *ti) { if (!ti) { return TPM_VERSION_UNSPEC; } =20 - return tpm_tis_get_tpm_version(OBJECT(ti)); + return TPM_IF_GET_CLASS(ti)->get_version(ti); } =20 #endif /* QEMU_TPM_H */ diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 954b7b0e5d..6aac9bfe6b 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -989,9 +989,9 @@ static void tpm_tis_realloc_buffer(TPMSizedBuffer *sb) /* * Get the TPMVersion of the backend device being used */ -TPMVersion tpm_tis_get_tpm_version(Object *obj) +static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti) { - TPMState *s =3D TPM(obj); + TPMState *s =3D TPM(ti); =20 return tpm_backend_get_tpm_version(s->be_driver); } @@ -1097,6 +1097,7 @@ static void tpm_tis_class_init(ObjectClass *klass, vo= id *data) dc->reset =3D tpm_tis_reset; dc->vmsd =3D &vmstate_tpm_tis; tc->model =3D TPM_MODEL_TPM_TIS; + tc->get_version =3D tpm_tis_get_tpm_version; tc->request_completed =3D tpm_tis_request_completed; } =20 --=20 2.14.1.146.gd35faa819