diff options
author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2021-06-15 16:21:21 +0200 |
---|---|---|
committer | Stefan Berger <stefanb@linux.ibm.com> | 2021-06-15 10:59:02 -0400 |
commit | caff255a546d12530cf7c28e60690cd0e65851fd (patch) | |
tree | 1ea8462dca5bf1f009dc9a08c07194cc96fb0433 /stubs | |
parent | e542b71805dc4b7827e6c2f00a1170a61843345e (diff) | |
download | qemu-caff255a546d12530cf7c28e60690cd0e65851fd.zip qemu-caff255a546d12530cf7c28e60690cd0e65851fd.tar.gz qemu-caff255a546d12530cf7c28e60690cd0e65851fd.tar.bz2 |
tpm: Return QMP error when TPM is disabled in build
When the management layer queries a binary built using --disable-tpm
for TPM devices, it gets confused by getting empty responses:
{ "execute": "query-tpm" }
{
"return": [
]
}
{ "execute": "query-tpm-types" }
{
"return": [
]
}
{ "execute": "query-tpm-models" }
{
"return": [
]
}
To make it clearer by returning an error:
- Make the TPM QAPI schema conditional
All of tpm.json is now 'if': 'defined(CONFIG_TPM)'.
- Adapt the HMP command
- Remove stubs which became unnecessary
The management layer now gets a 'CommandNotFound' error:
{ "execute": "query-tpm" }
{
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm has not been found"
}
}
Suggested-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Diffstat (limited to 'stubs')
-rw-r--r-- | stubs/meson.build | 1 | ||||
-rw-r--r-- | stubs/tpm.c | 25 |
2 files changed, 0 insertions, 26 deletions
diff --git a/stubs/meson.build b/stubs/meson.build index 65c22c0..d4e9549 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -38,7 +38,6 @@ stub_ss.add(files('runstate-check.c')) stub_ss.add(files('sysbus.c')) stub_ss.add(files('target-get-monitor-def.c')) stub_ss.add(files('target-monitor-defs.c')) -stub_ss.add(files('tpm.c')) stub_ss.add(files('trace-control.c')) stub_ss.add(files('uuid.c')) stub_ss.add(files('vmgenid.c')) diff --git a/stubs/tpm.c b/stubs/tpm.c deleted file mode 100644 index e79bd2a..0000000 --- a/stubs/tpm.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * TPM stubs - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "qapi/qapi-commands-tpm.h" -#include "hw/acpi/tpm.h" - -TPMInfoList *qmp_query_tpm(Error **errp) -{ - return NULL; -} - -TpmTypeList *qmp_query_tpm_types(Error **errp) -{ - return NULL; -} - -TpmModelList *qmp_query_tpm_models(Error **errp) -{ - return NULL; -} |