From nobody Mon Feb 9 17:04:58 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.zoho.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 1493726091123245.3994637263312; Tue, 2 May 2017 04:54:51 -0700 (PDT) Received: from localhost ([::1]:58212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WOH-0001tq-CF for importer@patchew.org; Tue, 02 May 2017 07:54:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WMd-0000mw-Dw for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5WMZ-00066B-1v for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:07 -0400 Received: from mga03.intel.com ([134.134.136.65]:28100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5WMY-0005ug-PV for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:02 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 04:53:02 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga003.jf.intel.com with ESMTP; 02 May 2017 04:53:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,405,1488873600"; d="scan'208";a="963424724" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 14:52:47 +0300 Message-Id: <1493725969-19518-7-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> References: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH v3 6/8] tpm-backend: Move realloc_buffer() implementation to base class 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: Amarnath Valluri , patrick.ohly@intel.com, marcandre.lureau@gmail.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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Provide base implementation of realloc_buffer(), so that backend implementa= tions can resue. Signed-off-by: Amarnath Valluri --- backends/tpm.c | 9 ++++++++- hw/tpm/tpm_passthrough.c | 12 ------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index 4a6358e..f048c1d 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -88,8 +88,15 @@ bool tpm_backend_had_startup_error(TPMBackend *s) size_t tpm_backend_realloc_buffer(TPMBackend *s, TPMSizedBuffer *sb) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); + if (!k->ops->realloc_buffer) { + size_t wanted_size =3D 4096; /* Linux tpm.c buffer size */ =20 - assert(k->ops->realloc_buffer); + if (sb->size !=3D wanted_size) { + sb->buffer =3D g_realloc(sb->buffer, wanted_size); + sb->size =3D wanted_size; + } + return sb->size; + } =20 return k->ops->realloc_buffer(sb); } diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 2efced1..a7da0f8 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -258,17 +258,6 @@ static bool tpm_passthrough_get_startup_error(TPMBacke= nd *tb) return tpm_pt->had_startup_error; } =20 -static size_t tpm_passthrough_realloc_buffer(TPMSizedBuffer *sb) -{ - size_t wanted_size =3D 4096; /* Linux tpm.c buffer size */ - - if (sb->size !=3D wanted_size) { - sb->buffer =3D g_realloc(sb->buffer, wanted_size); - sb->size =3D wanted_size; - } - return sb->size; -} - static void tpm_passthrough_cancel_cmd(TPMBackend *tb) { TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); @@ -470,7 +459,6 @@ static const TPMDriverOps tpm_passthrough_driver =3D { .opts =3D tpm_passthrough_cmdline_opts, .desc =3D tpm_passthrough_create_desc, .create =3D tpm_passthrough_create, - .realloc_buffer =3D tpm_passthrough_realloc_buffer, .reset =3D tpm_passthrough_reset, .had_startup_error =3D tpm_passthrough_get_startup_error, .cancel_cmd =3D tpm_passthrough_cancel_cmd, --=20 2.7.4