From: Amarnath Valluri <amarnath.valluri@intel.com>
To: qemu-devel@nongnu.org
Cc: stefanb@linux.vnet.ibm.com, patrick.ohly@intel.com,
marcandre.lureau@gmail.com, berrange@redhat.com,
Amarnath Valluri <amarnath.valluri@intel.com>
Subject: [Qemu-devel] [PATCH v3 6/8] tpm-backend: Move realloc_buffer() implementation to base class
Date: Tue, 2 May 2017 14:52:47 +0300 [thread overview]
Message-ID: <1493725969-19518-7-git-send-email-amarnath.valluri@intel.com> (raw)
In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com>
Provide base implementation of realloc_buffer(), so that backend implementations
can resue.
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
---
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 = 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 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(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,
--
2.7.4
next prev parent reply other threads:[~2017-05-02 11:53 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 11:52 [Qemu-devel] [PATCH v3 0/8] Provide support for the software TPM emulator Amarnath Valluri
2017-05-02 11:52 ` [Qemu-devel] [PATCH v3 1/8] tpm-backend: Remove unneeded member variable from backend class Amarnath Valluri
2017-05-02 11:59 ` Marc-André Lureau
2017-05-02 11:52 ` [Qemu-devel] [PATCH v3 2/8] tpm-backend: Move thread handling inside TPMBackend Amarnath Valluri
2017-05-02 12:10 ` Marc-André Lureau
2017-05-02 11:52 ` [Qemu-devel] [PATCH v3 3/8] tpm-backend: Initialize and free data members in it's own methods Amarnath Valluri
2017-05-02 12:17 ` Marc-André Lureau
2017-05-02 11:52 ` [Qemu-devel] [PATCH v3 4/8] tpm-backend: Made few interface methods optional Amarnath Valluri
2017-05-02 12:29 ` Marc-André Lureau
2017-05-04 8:39 ` Amarnath Valluri
2017-05-04 11:06 ` [Qemu-devel] [PATCH v4 " Amarnath Valluri
2017-05-02 11:52 ` [Qemu-devel] [PATCH v3 5/8] tmp backend: Add new api to read backend TpmInfo Amarnath Valluri
2017-05-02 13:35 ` Eric Blake
2017-05-04 9:05 ` Amarnath Valluri
2017-05-04 11:17 ` [Qemu-devel] [PATCH v4 " Amarnath Valluri
2017-05-02 11:52 ` Amarnath Valluri [this message]
2017-05-02 15:54 ` [Qemu-devel] [PATCH v3 6/8] tpm-backend: Move realloc_buffer() implementation to base class Marc-André Lureau
2017-05-04 9:25 ` Amarnath Valluri
2017-05-04 9:32 ` Marc-André Lureau
2017-05-04 11:31 ` [Qemu-devel] [PATCH v4 6/8] tpm-backend: Move realloc_buffer() implementation to tpm-tis model Amarnath Valluri
2017-05-06 12:27 ` Marc-André Lureau
2017-05-02 11:52 ` [Qemu-devel] [PATCH v3 7/8] tpm-passthrough: move reusable code to utils Amarnath Valluri
2017-05-02 15:54 ` Marc-André Lureau
2017-05-02 11:52 ` [Qemu-devel] [PATCH v3 8/8] tpm: Added support for TPM emulator Amarnath Valluri
2017-05-02 16:05 ` Marc-André Lureau
2017-05-02 16:32 ` Stefan Berger
2017-05-02 16:58 ` Stefan Berger
2017-05-02 17:09 ` Marc-André Lureau
2017-05-02 17:19 ` Stefan Berger
2017-05-02 18:25 ` Patrick Ohly
2017-05-02 18:50 ` Marc-André Lureau
2017-05-02 19:35 ` Stefan Berger
2017-05-03 8:41 ` Daniel P. Berrange
2017-05-03 11:17 ` Dr. David Alan Gilbert
2017-05-03 11:24 ` Marc-André Lureau
2017-05-03 11:29 ` Daniel P. Berrange
2017-05-03 11:37 ` Marc-André Lureau
2017-05-03 14:42 ` Stefan Berger
2017-05-04 9:44 ` Patrick Ohly
2017-05-04 11:08 ` Stefan Berger
2017-05-02 12:25 ` [Qemu-devel] [PATCH v3 0/8] Provide support for the software " no-reply
2017-05-04 11:35 ` [Qemu-devel] [PATCH v4 8/8] tpm: Added support for " Amarnath Valluri
2017-05-04 12:28 ` [Qemu-devel] [PATCH v3 0/8] Provide support for the software " Stefan Berger
2017-05-05 6:52 ` Amarnath Valluri
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1493725969-19518-7-git-send-email-amarnath.valluri@intel.com \
--to=amarnath.valluri@intel.com \
--cc=berrange@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=patrick.ohly@intel.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanb@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).