[Qemu-devel] [PATCH 05/13] error: define struct Error in only one place

[Wenchao Xia]

Signed-off-by: Wenchao Xia <address@hidden>
---
 include/qapi/error.h |    5 ++++-
 qobject/qerror.c     |    7 -------
 util/error.c         |    6 ------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/include/qapi/error.h b/include/qapi/error.h
index 7d4c696..8688aaf 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -20,7 +20,10 @@
  * A class representing internal errors within QEMU.  An error has a ErrorClass
  * code and a human message.
  */
-typedef struct Error Error;
+typedef struct Error {
+    char *msg;
+    ErrorClass err_class;
+} Error;
 
 /**
  * Set an indirect pointer to an error given a ErrorClass value and a
diff --git a/qobject/qerror.c b/qobject/qerror.c
index 3aee1cf..5b487f3 100644
--- a/qobject/qerror.c
+++ b/qobject/qerror.c
@@ -97,13 +97,6 @@ void qerror_report(ErrorClass eclass, const char *fmt, ...)
     }
 }
 
-/* Evil... */
-struct Error
-{
-    char *msg;
-    ErrorClass err_class;
-};
-
 void qerror_report_err(Error *err)
 {
     QError *qerr;
diff --git a/util/error.c b/util/error.c
index ec0faa6..da0d221 100644
--- a/util/error.c
+++ b/util/error.c
@@ -17,12 +17,6 @@
 #include "qapi-types.h"
 #include "qapi/qmp/qerror.h"
 
-struct Error
-{
-    char *msg;
-    ErrorClass err_class;
-};
-
 void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
 {
     Error *err;
-- 
1.7.1