*
* Based on net.c
*/
-#include "config-host.h"
+#include "qemu/osdep.h"
-#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
-#include "backends/tpm.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 TPMDriverOps const *be_drivers[TPM_TYPE__MAX];
+static bool tpm_models[TPM_MODEL__MAX];
-#define TPM_MAX_MODELS 1
-#define TPM_MAX_DRIVERS 1
-
-static TPMDriverOps const *be_drivers[TPM_MAX_DRIVERS] = {
- NULL,
-};
-
-static enum TpmModel tpm_models[TPM_MAX_MODELS] = {
- -1,
-};
-
-int tpm_register_model(enum TpmModel model)
+void tpm_register_model(enum TpmModel model)
{
- int i;
-
- for (i = 0; i < TPM_MAX_MODELS; i++) {
- if (tpm_models[i] == -1) {
- tpm_models[i] = model;
- return 0;
- }
- }
- error_report("Could not register TPM model");
- return 1;
-}
-
-static bool tpm_model_is_registered(enum TpmModel model)
-{
- int i;
-
- for (i = 0; i < TPM_MAX_MODELS; i++) {
- if (tpm_models[i] == model) {
- return true;
- }
- }
- return false;
+ tpm_models[model] = true;
}
const TPMDriverOps *tpm_get_backend_driver(const char *type)
{
- int i;
-
- for (i = 0; i < TPM_MAX_DRIVERS && be_drivers[i] != NULL; i++) {
- if (!strcmp(TpmType_lookup[be_drivers[i]->type], type)) {
- return be_drivers[i];
- }
- }
+ int i = qapi_enum_parse(&TpmType_lookup, type, -1, NULL);
- return NULL;
+ return i >= 0 ? be_drivers[i] : NULL;
}
#ifdef CONFIG_TPM
-int tpm_register_driver(const TPMDriverOps *tdo)
+void tpm_register_driver(const TPMDriverOps *tdo)
{
- int i;
+ assert(!be_drivers[tdo->type]);
- for (i = 0; i < TPM_MAX_DRIVERS; i++) {
- if (!be_drivers[i]) {
- be_drivers[i] = tdo;
- return 0;
- }
- }
- error_report("Could not register TPM driver");
- return 1;
+ be_drivers[tdo->type] = tdo;
}
/*
fprintf(stderr, "Supported TPM types (choose only one):\n");
- for (i = 0; i < TPM_MAX_DRIVERS && be_drivers[i] != NULL; i++) {
+ for (i = 0; i < TPM_TYPE__MAX; i++) {
+ if (be_drivers[i] == NULL) {
+ continue;
+ }
fprintf(stderr, "%12s %s\n",
- TpmType_lookup[be_drivers[i]->type], be_drivers[i]->desc());
+ TpmType_str(i), be_drivers[i]->desc());
}
fprintf(stderr, "\n");
}
Error *local_err = NULL;
if (!QLIST_EMPTY(&tpm_backends)) {
- error_report("Only one TPM is allowed.\n");
+ error_report("Only one TPM is allowed.");
return 1;
}
id = qemu_opts_id(opts);
if (id == NULL) {
- qerror_report(QERR_MISSING_PARAMETER, "id");
+ error_report(QERR_MISSING_PARAMETER, "id");
return 1;
}
value = qemu_opt_get(opts, "type");
if (!value) {
- qerror_report(QERR_MISSING_PARAMETER, "type");
+ error_report(QERR_MISSING_PARAMETER, "type");
tpm_display_backend_drivers();
return 1;
}
be = tpm_get_backend_driver(value);
if (be == NULL) {
- qerror_report(QERR_INVALID_PARAMETER_VALUE, "type",
- "a TPM backend type");
+ error_report(QERR_INVALID_PARAMETER_VALUE,
+ "type", "a TPM backend type");
tpm_display_backend_drivers();
return 1;
}
+ /* validate backend specific opts */
+ qemu_opts_validate(opts, be->opts, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ return 1;
+ }
+
drv = be->create(opts, id);
if (!drv) {
return 1;
tpm_backend_open(drv, &local_err);
if (local_err) {
- qerror_report_err(local_err);
- error_free(local_err);
+ error_report_err(local_err);
return 1;
}
return 0;
}
-static int tpm_init_tpmdev(QemuOpts *opts, void *dummy)
+static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)
{
return configure_tpm(opts);
}
int tpm_init(void)
{
if (qemu_opts_foreach(qemu_find_opts("tpmdev"),
- tpm_init_tpmdev, NULL, 1) != 0) {
+ tpm_init_tpmdev, NULL, NULL)) {
return -1;
}
atexit(tpm_cleanup);
-
return 0;
}
tpm_display_backend_drivers();
return -1;
}
- opts = qemu_opts_parse(opts_list, optarg, 1);
+ opts = qemu_opts_parse_noisily(opts_list, optarg, true);
if (!opts) {
return -1;
}
static const TPMDriverOps *tpm_driver_find_by_type(enum TpmType type)
{
- int i;
-
- for (i = 0; i < TPM_MAX_DRIVERS && be_drivers[i] != NULL; i++) {
- if (be_drivers[i]->type == type) {
- return be_drivers[i];
- }
- }
- return NULL;
+ return be_drivers[type];
}
static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv)
switch (drv->ops->type) {
case TPM_TYPE_PASSTHROUGH:
- res->options->kind = TPM_TYPE_OPTIONS_KIND_PASSTHROUGH;
+ res->options->type = TPM_TYPE_OPTIONS_KIND_PASSTHROUGH;
tpo = g_new0(TPMPassthroughOptions, 1);
- res->options->passthrough = tpo;
+ res->options->u.passthrough.data = tpo;
if (drv->path) {
tpo->path = g_strdup(drv->path);
tpo->has_path = true;
tpo->has_cancel_path = true;
}
break;
- case TPM_TYPE_MAX:
+ case TPM_TYPE__MAX:
break;
}
TPMInfoList *info, *head = NULL, *cur_item = NULL;
QLIST_FOREACH(drv, &tpm_backends, list) {
- if (!tpm_model_is_registered(drv->fe_model)) {
+ if (!tpm_models[drv->fe_model]) {
continue;
}
info = g_new0(TPMInfoList, 1);
unsigned int i = 0;
TpmTypeList *head = NULL, *prev = NULL, *cur_item;
- for (i = 0; i < TPM_TYPE_MAX; i++) {
+ for (i = 0; i < TPM_TYPE__MAX; i++) {
if (!tpm_driver_find_by_type(i)) {
continue;
}
unsigned int i = 0;
TpmModelList *head = NULL, *prev = NULL, *cur_item;
- for (i = 0; i < TPM_MODEL_MAX; i++) {
- if (!tpm_model_is_registered(i)) {
+ for (i = 0; i < TPM_MODEL__MAX; i++) {
+ if (!tpm_models[i]) {
continue;
}
cur_item = g_new0(TpmModelList, 1);
projects / mirror_qemu.git / blobdiff