aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS2
-rw-r--r--monitor/hmp-cmds.c54
-rw-r--r--softmmu/meson.build1
-rw-r--r--softmmu/tpm-hmp-cmds.c65
4 files changed, 67 insertions, 55 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3bd4d101d3..dab4def753 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3067,7 +3067,7 @@ T: git https://github.com/stefanha/qemu.git tracing
TPM
M: Stefan Berger <stefanb@linux.ibm.com>
S: Maintained
-F: softmmu/tpm.c
+F: softmmu/tpm*
F: hw/tpm/*
F: include/hw/acpi/tpm.h
F: include/sysemu/tpm*
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 6b1d5358f7..81f63fa8ec 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -22,7 +22,6 @@
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-stats.h"
-#include "qapi/qapi-commands-tpm.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qemu/cutils.h"
@@ -126,59 +125,6 @@ void hmp_info_pic(Monitor *mon, const QDict *qdict)
hmp_info_pic_foreach, mon);
}
-void hmp_info_tpm(Monitor *mon, const QDict *qdict)
-{
-#ifdef CONFIG_TPM
- TPMInfoList *info_list, *info;
- Error *err = NULL;
- unsigned int c = 0;
- TPMPassthroughOptions *tpo;
- TPMEmulatorOptions *teo;
-
- info_list = qmp_query_tpm(&err);
- if (err) {
- monitor_printf(mon, "TPM device not supported\n");
- error_free(err);
- return;
- }
-
- if (info_list) {
- monitor_printf(mon, "TPM device:\n");
- }
-
- for (info = info_list; info; info = info->next) {
- TPMInfo *ti = info->value;
- monitor_printf(mon, " tpm%d: model=%s\n",
- c, TpmModel_str(ti->model));
-
- monitor_printf(mon, " \\ %s: type=%s",
- ti->id, TpmType_str(ti->options->type));
-
- switch (ti->options->type) {
- case TPM_TYPE_PASSTHROUGH:
- tpo = ti->options->u.passthrough.data;
- monitor_printf(mon, "%s%s%s%s",
- tpo->path ? ",path=" : "",
- tpo->path ?: "",
- tpo->cancel_path ? ",cancel-path=" : "",
- tpo->cancel_path ?: "");
- break;
- case TPM_TYPE_EMULATOR:
- teo = ti->options->u.emulator.data;
- monitor_printf(mon, ",chardev=%s", teo->chardev);
- break;
- case TPM_TYPE__MAX:
- break;
- }
- monitor_printf(mon, "\n");
- c++;
- }
- qapi_free_TPMInfoList(info_list);
-#else
- monitor_printf(mon, "TPM device not supported\n");
-#endif /* CONFIG_TPM */
-}
-
void hmp_quit(Monitor *mon, const QDict *qdict)
{
monitor_suspend(mon);
diff --git a/softmmu/meson.build b/softmmu/meson.build
index 3272af1f31..efbf4ec029 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -25,6 +25,7 @@ softmmu_ss.add(files(
'rtc.c',
'runstate-action.c',
'runstate.c',
+ 'tpm-hmp-cmds.c',
'vl.c',
), sdl, libpmem, libdaxctl)
diff --git a/softmmu/tpm-hmp-cmds.c b/softmmu/tpm-hmp-cmds.c
new file mode 100644
index 0000000000..9ed6ad6c4d
--- /dev/null
+++ b/softmmu/tpm-hmp-cmds.c
@@ -0,0 +1,65 @@
+/*
+ * HMP commands related to TPM
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/qapi-commands-tpm.h"
+#include "monitor/monitor.h"
+#include "monitor/hmp.h"
+#include "qapi/error.h"
+
+void hmp_info_tpm(Monitor *mon, const QDict *qdict)
+{
+#ifdef CONFIG_TPM
+ TPMInfoList *info_list, *info;
+ Error *err = NULL;
+ unsigned int c = 0;
+ TPMPassthroughOptions *tpo;
+ TPMEmulatorOptions *teo;
+
+ info_list = qmp_query_tpm(&err);
+ if (err) {
+ monitor_printf(mon, "TPM device not supported\n");
+ error_free(err);
+ return;
+ }
+
+ if (info_list) {
+ monitor_printf(mon, "TPM device:\n");
+ }
+
+ for (info = info_list; info; info = info->next) {
+ TPMInfo *ti = info->value;
+ monitor_printf(mon, " tpm%d: model=%s\n",
+ c, TpmModel_str(ti->model));
+
+ monitor_printf(mon, " \\ %s: type=%s",
+ ti->id, TpmType_str(ti->options->type));
+
+ switch (ti->options->type) {
+ case TPM_TYPE_PASSTHROUGH:
+ tpo = ti->options->u.passthrough.data;
+ monitor_printf(mon, "%s%s%s%s",
+ tpo->path ? ",path=" : "",
+ tpo->path ?: "",
+ tpo->cancel_path ? ",cancel-path=" : "",
+ tpo->cancel_path ?: "");
+ break;
+ case TPM_TYPE_EMULATOR:
+ teo = ti->options->u.emulator.data;
+ monitor_printf(mon, ",chardev=%s", teo->chardev);
+ break;
+ case TPM_TYPE__MAX:
+ break;
+ }
+ monitor_printf(mon, "\n");
+ c++;
+ }
+ qapi_free_TPMInfoList(info_list);
+#else
+ monitor_printf(mon, "TPM device not supported\n");
+#endif /* CONFIG_TPM */
+}