summary refs log tree commit diff stats
path: root/backends/tpm.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-05-11 13:54:00 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-05-11 13:54:00 +0100
commit9ad2c8cd41a086020e21aa6d616b73bd5e2a800b (patch)
tree9e53cd27d30f066fb6bebcf0b9cfac5f1347efb1 /backends/tpm.c
parentb951cda21d6b232f138ccf008e12bce8ddc95465 (diff)
parent0caef8f6df4a9426bd6333ab843ce51ce005d7d0 (diff)
downloadfocaccia-qemu-9ad2c8cd41a086020e21aa6d616b73bd5e2a800b.tar.gz
focaccia-qemu-9ad2c8cd41a086020e21aa6d616b73bd5e2a800b.zip
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-05-09' into staging
trivial patches for 2015-05-09

# gpg: Signature made Fri May  8 22:58:42 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2015-05-09:
  docs: update BLOCK_IMAGE_CORRUPTED documentation
  glib-compat.h: change assert to g_assert
  Remove various unused functions
  sheepdog: fix resource leak with sd_snapshot_create
  xhci: remove unused code

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'backends/tpm.c')
-rw-r--r--backends/tpm.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/backends/tpm.c b/backends/tpm.c
index 4efe36736e..36c5d46f0a 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -165,17 +165,6 @@ void tpm_backend_thread_end(TPMBackendThread *tbt)
     }
 }
 
-void tpm_backend_thread_tpm_reset(TPMBackendThread *tbt,
-                                  GFunc func, gpointer user_data)
-{
-    if (!tbt->pool) {
-        tpm_backend_thread_create(tbt, func, user_data);
-    } else {
-        g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_TPM_RESET,
-                           NULL);
-    }
-}
-
 static const TypeInfo tpm_backend_info = {
     .name = TYPE_TPM_BACKEND,
     .parent = TYPE_OBJECT,