diff options
| -rw-r--r-- | error.c | 20 | ||||
| -rw-r--r-- | error_int.h | 28 | ||||
| -rw-r--r-- | qapi/qmp-dispatch.c | 1 | ||||
| -rw-r--r-- | qemu-ga.c | 1 |
4 files changed, 0 insertions, 50 deletions
@@ -15,7 +15,6 @@ #include "qjson.h" #include "qdict.h" #include "qapi-types.h" -#include "error_int.h" #include "qerror.h" struct Error @@ -91,22 +90,3 @@ void error_propagate(Error **dst_err, Error *local_err) error_free(local_err); } } - -QObject *error_get_qobject(Error *err) -{ - QINCREF(err->obj); - return QOBJECT(err->obj); -} - -void error_set_qobject(Error **errp, QObject *obj) -{ - Error *err; - if (errp == NULL) { - return; - } - err = g_malloc0(sizeof(*err)); - err->obj = qobject_to_qdict(obj); - qobject_incref(obj); - - *errp = err; -} diff --git a/error_int.h b/error_int.h deleted file mode 100644 index 4b00d0836e..0000000000 --- a/error_int.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * QEMU Error Objects - * - * Copyright IBM, Corp. 2011 - * - * Authors: - * Anthony Liguori <aliguori@us.ibm.com> - * - * This work is licensed under the terms of the GNU LGPL, version 2. See - * the COPYING.LIB file in the top-level directory. - */ -#ifndef QEMU_ERROR_INT_H -#define QEMU_ERROR_INT_H - -#include "qemu-common.h" -#include "qobject.h" -#include "qdict.h" -#include "error.h" - -/** - * Internal QEMU functions for working with Error. - * - * These are used to convert QErrors to Errors - */ -QObject *error_get_qobject(Error *err); -void error_set_qobject(Error **errp, QObject *obj); - -#endif diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index ec613f88b5..4085994686 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -16,7 +16,6 @@ #include "json-parser.h" #include "qapi-types.h" #include "error.h" -#include "error_int.h" #include "qerror.h" static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp) @@ -28,7 +28,6 @@ #include "module.h" #include "signal.h" #include "qerror.h" -#include "error_int.h" #include "qapi/qmp-core.h" #include "qga/channel.h" #ifdef _WIN32 |