diff options
| author | Markus Armbruster | 2015-03-17 14:29:59 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2015-06-22 18:20:40 +0200 |
| commit | 4629ed1e98961bbe678db68ef5f4342ff174a6c3 (patch) | |
| tree | f4f60bef891ba25caf9c9c3095a666418b58de3a /include | |
| parent | qmp: Wean off qerror_report() (diff) | |
| download | qemu-4629ed1e98961bbe678db68ef5f4342ff174a6c3.tar.gz qemu-4629ed1e98961bbe678db68ef5f4342ff174a6c3.tar.xz qemu-4629ed1e98961bbe678db68ef5f4342ff174a6c3.zip | |
qerror: Finally unused, clean up
Remove it except for two things in qerror.h:
* Two #include to be cleaned up separately to avoid cluttering this
patch.
* The QERR_ macros. Mark as obsolete.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/monitor/monitor.h | 1 | ||||
| -rw-r--r-- | include/qapi/qmp/qerror.h | 19 | ||||
| -rw-r--r-- | include/qapi/qmp/qobject.h | 1 |
3 files changed, 2 insertions, 19 deletions
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 33c28a43bf..aa831043eb 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -39,7 +39,6 @@ void monitor_flush(Monitor *mon); int monitor_set_cpu(int cpu_index); int monitor_get_cpu_index(void); -void monitor_set_error(Monitor *mon, QError *qerror); void monitor_read_command(Monitor *mon, int show_prompt); int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func, void *opaque); diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index e34741e92e..f8182c75f0 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -14,25 +14,10 @@ #include "qapi/qmp/qstring.h" #include "qemu/error-report.h" -#include "qapi/error.h" -#include "qapi-types.h" -#include <stdarg.h> - -typedef struct QError { - QObject_HEAD; - Location loc; - char *err_msg; - ErrorClass err_class; -} QError; - -QString *qerror_human(const QError *qerror); -void qerror_report(ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(2, 3); -void qerror_report_err(Error *err); /* - * QError class list - * Please keep the definitions in alphabetical order. - * Use scripts/check-qerror.sh to check. + * These macros will go away, please don't use in new code, and do not + * add new ones! */ #define QERR_BASE_NOT_FOUND \ "Base '%s' not found" diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h index 84b2d9fef5..260d2ed3cc 100644 --- a/include/qapi/qmp/qobject.h +++ b/include/qapi/qmp/qobject.h @@ -44,7 +44,6 @@ typedef enum { QTYPE_QLIST, QTYPE_QFLOAT, QTYPE_QBOOL, - QTYPE_QERROR, QTYPE_MAX, } qtype_code; |