target/arm: Add v8M stack checks for Thumb push/pop

[qemu.git] / tpm.c

diff --git a/tpm.c b/tpm.c
index abedf3f8cae3721e9905e6e9552fb0de0d768209..93031723ad7794d361b83c33eac44e65f6139aba 100644 (file)
--- a/tpm.c
+++ b/tpm.c
@@ -11,40 +11,34 @@
  *
  * Based on net.c
  */
  *
  * Based on net.c
  */

+

 #include "qemu/osdep.h"
 
 #include "qemu/osdep.h"
 

+#include "qapi/error.h"
+#include "qapi/qapi-commands-tpm.h"

 #include "qapi/qmp/qerror.h"
 #include "sysemu/tpm_backend.h"
 #include "sysemu/tpm.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/tpm_backend.h"
 #include "sysemu/tpm.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"

-#include "qmp-commands.h"

 
 static QLIST_HEAD(, TPMBackend) tpm_backends =
     QLIST_HEAD_INITIALIZER(tpm_backends);
 
 
 static QLIST_HEAD(, TPMBackend) tpm_backends =
     QLIST_HEAD_INITIALIZER(tpm_backends);
 

-static TPMDriverOps const *be_drivers[TPM_TYPE__MAX];
-static bool tpm_models[TPM_MODEL__MAX];
-
-void tpm_register_model(enum TpmModel model)
-{
-    tpm_models[model] = true;
-}
-
-const TPMDriverOps *tpm_get_backend_driver(const char *type)
+static const TPMBackendClass *
+tpm_be_find_by_type(enum TpmType type)

 {
 {

-    int i = qapi_enum_parse(&TpmType_lookup, type, -1, NULL);
+    ObjectClass *oc;
+    char *typename = g_strdup_printf("tpm-%s", TpmType_str(type));

 
 

-    return i >= 0 ? be_drivers[i] : NULL;
-}
-
-#ifdef CONFIG_TPM
+    oc = object_class_by_name(typename);
+    g_free(typename);

 
 

-void tpm_register_driver(const TPMDriverOps *tdo)
-{
-    assert(!be_drivers[tdo->type]);
+    if (!object_class_dynamic_cast(oc, TYPE_TPM_BACKEND)) {
+        return NULL;
+    }

 
 

-    be_drivers[tdo->type] = tdo;
+    return TPM_BACKEND_CLASS(oc);

 }
 
 /*
 }
 
 /*


@@ -58,11 +52,11 @@ static void tpm_display_backend_drivers(void)
     fprintf(stderr, "Supported TPM types (choose only one):\n");
 
     for (i = 0; i < TPM_TYPE__MAX; i++) {
     fprintf(stderr, "Supported TPM types (choose only one):\n");
 
     for (i = 0; i < TPM_TYPE__MAX; i++) {

-        if (be_drivers[i] == NULL) {
+        const TPMBackendClass *bc = tpm_be_find_by_type(i);
+        if (!bc) {

             continue;
         }
             continue;
         }

-        fprintf(stderr, "%12s   %s\n",
-                TpmType_str(i), be_drivers[i]->desc());
+        fprintf(stderr, "%12s   %s\n", TpmType_str(i), bc->desc);

     }
     fprintf(stderr, "\n");
 }
     }
     fprintf(stderr, "\n");
 }


@@ -70,7 +64,7 @@ static void tpm_display_backend_drivers(void)
 /*
  * Find the TPM with the given Id
  */
 /*
  * Find the TPM with the given Id
  */

-TPMBackend *qemu_find_tpm(const char *id)
+TPMBackend *qemu_find_tpm_be(const char *id)

 {
     TPMBackend *drv;
 
 {
     TPMBackend *drv;
 


@@ -85,13 +79,14 @@ TPMBackend *qemu_find_tpm(const char *id)
     return NULL;
 }
 
     return NULL;
 }
 

-static int configure_tpm(QemuOpts *opts)
+static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)

 {
     const char *value;
     const char *id;
 {
     const char *value;
     const char *id;

-    const TPMDriverOps *be;
+    const TPMBackendClass *be;

     TPMBackend *drv;
     Error *local_err = NULL;
     TPMBackend *drv;
     Error *local_err = NULL;

+    int i;

 
     if (!QLIST_EMPTY(&tpm_backends)) {
         error_report("Only one TPM is allowed.");
 
     if (!QLIST_EMPTY(&tpm_backends)) {
         error_report("Only one TPM is allowed.");


@@ -111,7 +106,8 @@ static int configure_tpm(QemuOpts *opts)
         return 1;
     }
 
         return 1;
     }
 

-    be = tpm_get_backend_driver(value);
+    i = qapi_enum_parse(&TpmType_lookup, value, -1, NULL);
+    be = i >= 0 ? tpm_be_find_by_type(i) : NULL;

     if (be == NULL) {
         error_report(QERR_INVALID_PARAMETER_VALUE,
                      "type", "a TPM backend type");
     if (be == NULL) {
         error_report(QERR_INVALID_PARAMETER_VALUE,
                      "type", "a TPM backend type");


@@ -126,27 +122,17 @@ static int configure_tpm(QemuOpts *opts)
         return 1;
     }
 
         return 1;
     }
 

-    drv = be->create(opts, id);
+    drv = be->create(opts);

     if (!drv) {
         return 1;
     }
 
     if (!drv) {
         return 1;
     }
 

-    tpm_backend_open(drv, &local_err);
-    if (local_err) {
-        error_report_err(local_err);
-        return 1;
-    }
-
+    drv->id = g_strdup(id);

     QLIST_INSERT_HEAD(&tpm_backends, drv, list);
 
     return 0;
 }
 
     QLIST_INSERT_HEAD(&tpm_backends, drv, list);
 
     return 0;
 }
 

-static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)
-{
-    return configure_tpm(opts);
-}
-

 /*
  * Walk the list of TPM backend drivers that are in use and call their
  * destroy function to have them cleaned up.
 /*
  * Walk the list of TPM backend drivers that are in use and call their
  * destroy function to have them cleaned up.


@@ -157,7 +143,7 @@ void tpm_cleanup(void)
 
     QLIST_FOREACH_SAFE(drv, &tpm_backends, list, next) {
         QLIST_REMOVE(drv, list);
 
     QLIST_FOREACH_SAFE(drv, &tpm_backends, list, next) {
         QLIST_REMOVE(drv, list);

-        tpm_backend_destroy(drv);
+        object_unref(OBJECT(drv));

     }
 }
 
     }
 }
 


@@ -172,7 +158,6 @@ int tpm_init(void)
         return -1;
     }
 
         return -1;
     }
 

-    atexit(tpm_cleanup);

     return 0;
 }
 
     return 0;
 }
 


@@ -195,46 +180,8 @@ int tpm_config_parse(QemuOptsList *opts_list, const char *optarg)
     return 0;
 }
 
     return 0;
 }
 

-#endif /* CONFIG_TPM */
-
-static const TPMDriverOps *tpm_driver_find_by_type(enum TpmType type)
-{
-    return be_drivers[type];
-}
-
-static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv)
-{
-    TPMInfo *res = g_new0(TPMInfo, 1);
-    TPMPassthroughOptions *tpo;
-
-    res->id = g_strdup(drv->id);
-    res->model = drv->fe_model;
-    res->options = g_new0(TpmTypeOptions, 1);
-
-    switch (tpm_backend_get_type(drv)) {
-    case TPM_TYPE_PASSTHROUGH:
-        res->options->type = TPM_TYPE_OPTIONS_KIND_PASSTHROUGH;
-        tpo = g_new0(TPMPassthroughOptions, 1);
-        res->options->u.passthrough.data = tpo;
-        if (drv->path) {
-            tpo->path = g_strdup(drv->path);
-            tpo->has_path = true;
-        }
-        if (drv->cancel_path) {
-            tpo->cancel_path = g_strdup(drv->cancel_path);
-            tpo->has_cancel_path = true;
-        }
-        break;
-    case TPM_TYPE__MAX:
-        break;
-    }
-
-    return res;
-}
-

 /*
 /*

- * Walk the list of active TPM backends and collect information about them
- * following the schema description in qapi-schema.json.
+ * Walk the list of active TPM backends and collect information about them.

  */
 TPMInfoList *qmp_query_tpm(Error **errp)
 {
  */
 TPMInfoList *qmp_query_tpm(Error **errp)
 {


@@ -242,11 +189,12 @@ TPMInfoList *qmp_query_tpm(Error **errp)
     TPMInfoList *info, *head = NULL, *cur_item = NULL;
 
     QLIST_FOREACH(drv, &tpm_backends, list) {
     TPMInfoList *info, *head = NULL, *cur_item = NULL;
 
     QLIST_FOREACH(drv, &tpm_backends, list) {

-        if (!tpm_models[drv->fe_model]) {
+        if (!drv->tpmif) {

             continue;
         }
             continue;
         }

+

         info = g_new0(TPMInfoList, 1);
         info = g_new0(TPMInfoList, 1);

-        info->value = qmp_query_tpm_inst(drv);
+        info->value = tpm_backend_query_tpm(drv);

 
         if (!cur_item) {
             head = cur_item = info;
 
         if (!cur_item) {
             head = cur_item = info;


@@ -265,7 +213,7 @@ TpmTypeList *qmp_query_tpm_types(Error **errp)
     TpmTypeList *head = NULL, *prev = NULL, *cur_item;
 
     for (i = 0; i < TPM_TYPE__MAX; i++) {
     TpmTypeList *head = NULL, *prev = NULL, *cur_item;
 
     for (i = 0; i < TPM_TYPE__MAX; i++) {

-        if (!tpm_driver_find_by_type(i)) {
+        if (!tpm_be_find_by_type(i)) {

             continue;
         }
         cur_item = g_new0(TpmTypeList, 1);
             continue;
         }
         cur_item = g_new0(TpmTypeList, 1);


@@ -282,18 +230,16 @@ TpmTypeList *qmp_query_tpm_types(Error **errp)
 
     return head;
 }
 
     return head;
 }

-

 TpmModelList *qmp_query_tpm_models(Error **errp)
 {
 TpmModelList *qmp_query_tpm_models(Error **errp)
 {

-    unsigned int i = 0;

     TpmModelList *head = NULL, *prev = NULL, *cur_item;
     TpmModelList *head = NULL, *prev = NULL, *cur_item;

+    GSList *e, *l = object_class_get_list(TYPE_TPM_IF, false);
+
+    for (e = l; e; e = e->next) {
+        TPMIfClass *c = TPM_IF_CLASS(e->data);

 
 

-    for (i = 0; i < TPM_MODEL__MAX; i++) {
-        if (!tpm_models[i]) {
-            continue;
-        }

         cur_item = g_new0(TpmModelList, 1);
         cur_item = g_new0(TpmModelList, 1);

-        cur_item->value = i;
+        cur_item->value = c->model;

 
         if (prev) {
             prev->next = cur_item;
 
         if (prev) {
             prev->next = cur_item;


@@ -303,6 +249,7 @@ TpmModelList *qmp_query_tpm_models(Error **errp)
         }
         prev = cur_item;
     }
         }
         prev = cur_item;
     }

+    g_slist_free(l);

 
     return head;
 }
 
     return head;
 }