[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 31/35] error: drop error_get_qobject()/error_set_qob
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 31/35] error: drop error_get_qobject()/error_set_qobject() |
Date: |
Tue, 7 Aug 2012 12:53:42 -0300 |
error_get_qobject() is unused since last commit, error_set_qobject()
has never been used. Also drops error_int.h.
Signed-off-by: Luiz Capitulino <address@hidden>
---
error.c | 20 --------------------
error_int.h | 28 ----------------------------
qapi/qmp-dispatch.c | 1 -
qemu-ga.c | 1 -
4 files changed, 50 deletions(-)
delete mode 100644 error_int.h
diff --git a/error.c b/error.c
index b1d5131..9d7b35f 100644
--- a/error.c
+++ b/error.c
@@ -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 4b00d08..0000000
--- a/error_int.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * QEMU Error Objects
- *
- * Copyright IBM, Corp. 2011
- *
- * Authors:
- * Anthony Liguori <address@hidden>
- *
- * 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 ec613f8..4085994 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)
diff --git a/qemu-ga.c b/qemu-ga.c
index 39abc50..8f87621 100644
--- a/qemu-ga.c
+++ b/qemu-ga.c
@@ -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
--
1.7.11.2.249.g31c7954.dirty
- [Qemu-devel] [PATCH 07/35] qerror: QError: drop file, linenr, func, (continued)
- [Qemu-devel] [PATCH 07/35] qerror: QError: drop file, linenr, func, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 12/35] hmp: hmp_cont(): don't rely on QERR_DEVICE_ENCRYPTED, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 02/35] qerror: QERR_AMBIGUOUS_PATH: drop %(object) from human msg, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 09/35] qerror: don't delay error message construction, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 13/35] hmp_change(): don't access DeviceEncrypted's data, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 20/35] qapi: generate correct enum names for camel case enums, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 17/35] block: block_int: include qerror.h, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 03/35] qerror: QERR_DEVICE_ENCRYPTED: change error message, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 35/35] docs: writing-qmp-commands.txt: update error section, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 33/35] qerror: drop qerror_table and qerror_format(), Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 31/35] error: drop error_get_qobject()/error_set_qobject(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 11/35] qmp: query-block: add 'valid_encryption_key' field, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 16/35] qerror: drop QERR_SOCKET_CONNECT_IN_PROGRESS, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 18/35] hmp: hmp.h: include qdict.h, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 34/35] error, qerror: drop QDict member, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 23/35] qerror: qerror_table: don't use C99 struct initializers, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 21/35] qapi: don't convert enum strings to lowercase, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 25/35] qerror: add proper ErrorClass value for QERR_ macros, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 28/35] error: drop unused functions, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 29/35] qmp: switch to the new error format on the wire, Luiz Capitulino, 2012/08/07
- [Qemu-devel] [PATCH 06/35] qerror: avoid passing qerr pointer, Luiz Capitulino, 2012/08/07