ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm: Clean up error reporting in tpm_init_tpmdev() 

Calling error_report() in a function that takes an Error ** argument
is suspicious.  tpm_init_tpmdev() does that, and then fails without
setting an error.  Its caller main(), via tpm_init() and
qemu_opts_foreach(), is fine with it, but clean it up anyway.

Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-Id: <20181017082702.5581-30-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-10-17 10:26:53 +02:00
parent 4f7ec696f4
commit d10e05f15d
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sysemu/tpm.h
View File

@ -16,7 +16,7 @@
#include "qom/object.h" #include "qom/object.h"
int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);
int tpm_init(void); void tpm_init(void);
void tpm_cleanup(void); void tpm_cleanup(void);
typedef enum TPMVersion { typedef enum TPMVersion {

3
stubs/tpm.c
View File

@ -9,9 +9,8 @@
#include "qapi/qapi-commands-tpm.h" #include "qapi/qapi-commands-tpm.h"
#include "sysemu/tpm.h" #include "sysemu/tpm.h"
int tpm_init(void) void tpm_init(void)
{ {
return 0;
} }
void tpm_cleanup(void) void tpm_cleanup(void)

22
tpm.c
View File

@ -89,19 +89,19 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)
int i; int i;
if (!QLIST_EMPTY(&tpm_backends)) { if (!QLIST_EMPTY(&tpm_backends)) {
error_report("Only one TPM is allowed."); error_setg(errp, "Only one TPM is allowed.");
return 1; return 1;
} }
id = qemu_opts_id(opts); id = qemu_opts_id(opts);
if (id == NULL) { if (id == NULL) {
error_report(QERR_MISSING_PARAMETER, "id"); error_setg(errp, QERR_MISSING_PARAMETER, "id");
return 1; return 1;
} }
value = qemu_opt_get(opts, "type"); value = qemu_opt_get(opts, "type");
if (!value) { if (!value) {
error_report(QERR_MISSING_PARAMETER, "type"); error_setg(errp, QERR_MISSING_PARAMETER, "type");
tpm_display_backend_drivers(); tpm_display_backend_drivers();
return 1; return 1;
} }
@ -109,8 +109,8 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)
i = qapi_enum_parse(&TpmType_lookup, value, -1, NULL); i = qapi_enum_parse(&TpmType_lookup, value, -1, NULL);
be = i >= 0 ? tpm_be_find_by_type(i) : NULL; be = i >= 0 ? tpm_be_find_by_type(i) : NULL;
if (be == NULL) { if (be == NULL) {
error_report(QERR_INVALID_PARAMETER_VALUE, error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type",
"type", "a TPM backend type"); "a TPM backend type");
tpm_display_backend_drivers(); tpm_display_backend_drivers();
return 1; return 1;
} }
@ -118,7 +118,7 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)
/* validate backend specific opts */ /* validate backend specific opts */
qemu_opts_validate(opts, be->opts, &local_err); qemu_opts_validate(opts, be->opts, &local_err);
if (local_err) { if (local_err) {
error_report_err(local_err); error_propagate(errp, local_err);
return 1; return 1;
} }
@ -151,14 +151,10 @@ void tpm_cleanup(void)
* Initialize the TPM. Process the tpmdev command line options describing the * Initialize the TPM. Process the tpmdev command line options describing the
* TPM backend. * TPM backend.
*/ */
int tpm_init(void) void tpm_init(void)
{ {
if (qemu_opts_foreach(qemu_find_opts("tpmdev"), qemu_opts_foreach(qemu_find_opts("tpmdev"),
tpm_init_tpmdev, NULL, NULL)) { tpm_init_tpmdev, NULL, &error_fatal);
return -1;
}
return 0;
} }
/* /*

4
vl.c
View File

@ -4360,9 +4360,7 @@ int main(int argc, char **argv, char **envp)
user_creatable_add_opts_foreach, user_creatable_add_opts_foreach,
object_create_delayed, &error_fatal); object_create_delayed, &error_fatal);
if (tpm_init() < 0) { tpm_init();
exit(1);
}
/* init the bluetooth world */ /* init the bluetooth world */
if (foreach_device_config(DEV_BT, bt_parse)) if (foreach_device_config(DEV_BT, bt_parse))