Skip to content

Commit

Permalink
tpm: Avoid qerror_report() outside QMP command handlers
Browse files Browse the repository at this point in the history
qerror_report() is a transitional interface to help with converting
existing monitor commands to QMP.  It should not be used elsewhere.
Replace by error_report().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
  • Loading branch information
Markus Armbruster committed Jun 22, 2015
1 parent c6bd8c7 commit 8b53a19
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions tpm.c
Expand Up @@ -140,22 +140,21 @@ static int configure_tpm(QemuOpts *opts)

id = qemu_opts_id(opts);
if (id == NULL) {
qerror_report(ERROR_CLASS_GENERIC_ERROR, QERR_MISSING_PARAMETER, "id");
error_report(QERR_MISSING_PARAMETER, "id");
return 1;
}

value = qemu_opt_get(opts, "type");
if (!value) {
qerror_report(ERROR_CLASS_GENERIC_ERROR, 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(ERROR_CLASS_GENERIC_ERROR, 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;
}
Expand Down

0 comments on commit 8b53a19

Please sign in to comment.