qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Stefan Berger" <stefanb@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PULL v1 25/32] qdev: add DEFINE_PROP_TPMBE
Date: Sat, 16 Dec 2017 12:41:42 -0500	[thread overview]
Message-ID: <1513446109-9013-26-git-send-email-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <1513446109-9013-1-git-send-email-stefanb@linux.vnet.ibm.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

A property to lookup a tpm backend.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 hw/core/qdev-properties-system.c | 64 ++++++++++++++++++++++++++++++++++++++++
 include/hw/qdev-properties.h     |  3 ++
 2 files changed, 67 insertions(+)

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index ec10da7..c173646 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -21,6 +21,7 @@
 #include "net/hub.h"
 #include "qapi/visitor.h"
 #include "chardev/char-fe.h"
+#include "sysemu/tpm_backend.h"
 #include "sysemu/iothread.h"
 
 static void get_pointer(Object *obj, Visitor *v, Property *prop,
@@ -236,6 +237,69 @@ const PropertyInfo qdev_prop_chr = {
     .release = release_chr,
 };
 
+/* --- character device --- */
+
+static void get_tpm(Object *obj, Visitor *v, const char *name, void *opaque,
+                    Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    TPMBackend **be = qdev_get_prop_ptr(dev, opaque);
+    char *p;
+
+    p = g_strdup(*be ? (*be)->id : "");
+    visit_type_str(v, name, &p, errp);
+    g_free(p);
+}
+
+static void set_tpm(Object *obj, Visitor *v, const char *name, void *opaque,
+                    Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    Error *local_err = NULL;
+    Property *prop = opaque;
+    TPMBackend *s, **be = qdev_get_prop_ptr(dev, prop);
+    char *str;
+
+    if (dev->realized) {
+        qdev_prop_set_after_realize(dev, name, errp);
+        return;
+    }
+
+    visit_type_str(v, name, &str, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
+
+    s = qemu_find_tpm_be(str);
+    if (s == NULL) {
+        error_setg(errp, "Property '%s.%s' can't find value '%s'",
+                   object_get_typename(obj), prop->name, str);
+    } else if (tpm_backend_init(s, TPM_IF(obj), errp) == 0) {
+        *be = s; /* weak reference, avoid cyclic ref */
+    }
+    g_free(str);
+}
+
+static void release_tpm(Object *obj, const char *name, void *opaque)
+{
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    TPMBackend **be = qdev_get_prop_ptr(dev, prop);
+
+    if (*be) {
+        tpm_backend_reset(*be);
+    }
+}
+
+const PropertyInfo qdev_prop_tpm = {
+    .name  = "str",
+    .description = "ID of a tpm to use as a backend",
+    .get   = get_tpm,
+    .set   = set_tpm,
+    .release = release_tpm,
+};
+
 /* --- netdev device --- */
 static void get_netdev(Object *obj, Visitor *v, const char *name,
                        void *opaque, Error **errp)
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index e2321f1..4d24cdf 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -17,6 +17,7 @@ extern const PropertyInfo qdev_prop_int64;
 extern const PropertyInfo qdev_prop_size;
 extern const PropertyInfo qdev_prop_string;
 extern const PropertyInfo qdev_prop_chr;
+extern const PropertyInfo qdev_prop_tpm;
 extern const PropertyInfo qdev_prop_ptr;
 extern const PropertyInfo qdev_prop_macaddr;
 extern const PropertyInfo qdev_prop_on_off_auto;
@@ -186,6 +187,8 @@ extern const PropertyInfo qdev_prop_link;
 
 #define DEFINE_PROP_CHR(_n, _s, _f)             \
     DEFINE_PROP(_n, _s, _f, qdev_prop_chr, CharBackend)
+#define DEFINE_PROP_TPMBE(_n, _s, _f)                     \
+    DEFINE_PROP(_n, _s, _f, qdev_prop_tpm, TPMBackend *)
 #define DEFINE_PROP_STRING(_n, _s, _f)             \
     DEFINE_PROP(_n, _s, _f, qdev_prop_string, char*)
 #define DEFINE_PROP_NETDEV(_n, _s, _f)             \
-- 
2.5.5

  parent reply	other threads:[~2017-12-16 17:42 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-16 17:41 [Qemu-devel] [PULL v1 00/32] Merge tpm 2017/12/15 Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 01/32] tpm-tis: remove unused locty_number Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 02/32] tpm: move TpmIf in include/sysemu/tpm.h Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 03/32] tpm-backend: store TPMIf interface, improve backend_init() Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 04/32] tpm-tis: no longer expose TPMState Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 05/32] tpm-be: call request_completed() out of thread Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 06/32] tpm-be: report error instead of front-end Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 07/32] tpm-be: ask model to the TPM interface Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 08/32] tpm: remove unused opened code Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 09/32] tpm-passthrough: don't save guessed cancel_path in options Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 10/32] tpm-be: update optional function pointers Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 11/32] tpm-passthrough: pass TPMPassthruState to handle_device_opts Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 12/32] tpm-backend: move set 'id' to common code Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 13/32] tpm-passthrough: make it safer to destroy after creation Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 14/32] tpm-passthrough: simplify create() Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 15/32] tpm-passthrough: workaround a possible race Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 16/32] tpm-tis: simplify header inclusion Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 17/32] tpm: rename qemu_find_tpm() -> qemu_find_tpm_be() Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 18/32] tpm: lookup the the TPM interface instead of TIS device Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 19/32] tpm: add TPM interface to lookup TPM version Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 20/32] tpm: add tpm_cmd_get_size() to tpm_util Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 21/32] acpi: change TPM TIS data conditions Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 22/32] tpm-emulator: add a FIXME comment about blocking cancel Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 23/32] tpm-tis: remove redundant 'tpm_tis:' in error messages Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 24/32] tpm-tis: check that at most one TPM device exists Stefan Berger
2017-12-16 17:41 ` Stefan Berger [this message]
2017-12-18 15:10   ` [Qemu-devel] [PULL v1 25/32] qdev: add DEFINE_PROP_TPMBE Laurent Vivier
2017-12-18 15:30     ` Cornelia Huck
2017-12-18 15:44       ` Laurent Vivier
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 26/32] tpm-tis: use DEFINE_PROP_TPMBE Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 27/32] tpm: remove tpm_register_model() Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 28/32] tpm: Move getting TPM buffer size to backends Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 29/32] tpm: pull tpm_util_request() out of tpm_util_test() Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 30/32] tpm: tpm_passthrough: Read the buffer size from the host device Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 31/32] tpm: tpm_emulator: get and set buffer size of device Stefan Berger
2017-12-16 17:41 ` [Qemu-devel] [PULL v1 32/32] tpm: tpm_passthrough: Fail startup if FE buffer size < BE buffer size Stefan Berger
2017-12-17 21:34 ` [Qemu-devel] [PULL v1 00/32] Merge tpm 2017/12/15 Peter Maydell
2017-12-18 11:18   ` Thomas Huth
2017-12-18 11:50     ` Thomas Huth
2017-12-18 12:33       ` Peter Maydell

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=1513446109-9013-26-git-send-email-stefanb@linux.vnet.ibm.com \
    --to=stefanb@linux.vnet.ibm.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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).