From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Stefan Berger" <stefanb@linux.vnet.ibm.com>
Subject: [PATCH] tpm: Return QMP error when TPM is disabled in build
Date: Wed, 9 Jun 2021 17:25:59 +0200 [thread overview]
Message-ID: <20210609152559.1088596-1-philmd@redhat.com> (raw)
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": [
]
}
Make it clearer by returning an error, mentioning the feature is
disabled:
{ "execute": "query-tpm" }
{
"error": {
"class": "GenericError",
"desc": "this feature or command is not currently supported"
}
}
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
stubs/tpm.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/stubs/tpm.c b/stubs/tpm.c
index 9bded191d9d..8c904215b39 100644
--- a/stubs/tpm.c
+++ b/stubs/tpm.c
@@ -7,6 +7,8 @@
#include "qemu/osdep.h"
#include "qapi/qapi-commands-tpm.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/error.h"
#include "sysemu/tpm.h"
#include "hw/acpi/tpm.h"
@@ -21,16 +23,19 @@ void tpm_cleanup(void)
TPMInfoList *qmp_query_tpm(Error **errp)
{
+ error_setg(errp, QERR_UNSUPPORTED);
return NULL;
}
TpmTypeList *qmp_query_tpm_types(Error **errp)
{
+ error_setg(errp, QERR_UNSUPPORTED);
return NULL;
}
TpmModelList *qmp_query_tpm_models(Error **errp)
{
+ error_setg(errp, QERR_UNSUPPORTED);
return NULL;
}
--
2.31.1
next reply other threads:[~2021-06-09 15:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 15:25 Philippe Mathieu-Daudé [this message]
2021-06-09 16:01 ` [PATCH] tpm: Return QMP error when TPM is disabled in build Marc-André Lureau
2021-06-09 17:27 ` Philippe Mathieu-Daudé
2021-06-09 17:34 ` Philippe Mathieu-Daudé
2021-06-09 17:36 ` Daniel P. Berrangé
2021-06-09 17:46 ` Philippe Mathieu-Daudé
2021-06-10 9:15 ` Markus Armbruster
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=20210609152559.1088596-1-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanb@linux.vnet.ibm.com \
/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).