From patchwork Fri Apr 7 14:30:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amarnath Valluri X-Patchwork-Id: 9669621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 860826021C for ; Fri, 7 Apr 2017 14:35:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7793828608 for ; Fri, 7 Apr 2017 14:35:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CA9628616; Fri, 7 Apr 2017 14:35:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0FDE028608 for ; Fri, 7 Apr 2017 14:35:37 +0000 (UTC) Received: from localhost ([::1]:51179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUzA-000823-45 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 07 Apr 2017 10:35:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwUuR-0005G3-NV for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwUuQ-0002dM-I4 for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:43 -0400 Received: from mga03.intel.com ([134.134.136.65]:63385) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cwUuP-0002ZL-Fm for qemu-devel@nongnu.org; Fri, 07 Apr 2017 10:30:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491575441; x=1523111441; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=egBs69JVQwqSfFSIXH5rhr5zo+MOuQn4NmdYzFgdhH4=; b=azg7A9CAJJzjbbq1BMgArw86SQqJmUZfJu2CJAh1iorr+0FmEr1C7Mzn j8DzCpuP234krX8eCcNwgrDfdu+9Zg==; Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Apr 2017 07:30:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,165,1488873600"; d="scan'208";a="245879793" Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by fmsmga004.fm.intel.com with ESMTP; 07 Apr 2017 07:30:39 -0700 From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Fri, 7 Apr 2017 17:30:29 +0300 Message-Id: <1491575431-32170-8-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491575431-32170-1-git-send-email-amarnath.valluri@intel.com> References: <1491575431-32170-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 v2 7/9] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Provide base implementation of realloc_buffer(), so that backend implementations 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 3493df6..0da73e6 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 = TPM_BACKEND_GET_CLASS(s); + if (!k->ops->realloc_buffer) { + size_t wanted_size = 4096; /* Linux tpm.c buffer size */ - assert(k->ops->realloc_buffer); + if (sb->size != wanted_size) { + sb->buffer = g_realloc(sb->buffer, wanted_size); + sb->size = wanted_size; + } + return sb->size; + } return k->ops->realloc_buffer(sb); } diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 8e11ed3..1bffb6d 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -258,17 +258,6 @@ static bool tpm_passthrough_get_startup_error(TPMBackend *tb) return tpm_pt->had_startup_error; } -static size_t tpm_passthrough_realloc_buffer(TPMSizedBuffer *sb) -{ - size_t wanted_size = 4096; /* Linux tpm.c buffer size */ - - if (sb->size != wanted_size) { - sb->buffer = g_realloc(sb->buffer, wanted_size); - sb->size = wanted_size; - } - return sb->size; -} - static void tpm_passthrough_cancel_cmd(TPMBackend *tb) { TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb); @@ -470,7 +459,6 @@ static const TPMDriverOps tpm_passthrough_driver = { .opts = tpm_passthrough_cmdline_opts, .desc = tpm_passthrough_create_desc, .create = tpm_passthrough_create, - .realloc_buffer = tpm_passthrough_realloc_buffer, .reset = tpm_passthrough_reset, .had_startup_error = tpm_passthrough_get_startup_error, .cancel_cmd = tpm_passthrough_cancel_cmd,