commit 8b53a19675d2329695179e47aa3797692fb0d9ba
author Markus Armbruster <armbru@redhat.com> Tue Mar 17 12:09:02 2015 +0100
committer Markus Armbruster <armbru@redhat.com> Mon Jun 22 18:20:40 2015 +0200
tree 66a14e70992008ca15dba2ac82f9de812fefbb67
parent c6bd8c706a799eb0fece99f468aaa22b818036f3

tpm: Avoid qerror_report() outside QMP command handlers

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>

tpm.c

diff --git a/tpm.c b/tpm.c
index 8dadc67..c8889fa 100644
--- a/tpm.c
+++ b/tpm.c
@@ -140,22 +140,21 @@
 
     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;
     }