commit d34b480eba7f9ee47de9b46c13808f5f6f9214f2
author David 'Digit' Turner <digit@google.com> Tue May 13 13:39:52 2014 +0200
committer David 'Digit' Turner <digit@google.com> Fri Jul 18 15:31:45 2014 +0200
tree 6017fabb95fa1277a55b785cf1886bc46a4fb783
parent fab113cc950d4692decf8df6793a6207679535aa

Update <qmp/qerror.h>

Change-Id: I9ec4d3e8a54b8ec651ac45254085639fbf9c3b52

include/qapi/qmp/qerror.h

diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index c30c2f6..da75abf 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -29,7 +29,6 @@
 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);
-void assert_no_error(Error *err);
 
 /*
  * QError class list
@@ -106,7 +105,7 @@
     ERROR_CLASS_GENERIC_ERROR, "Device '%s' does not support hotplugging"
 
 #define QERR_DEVICE_NOT_ACTIVE \
-    ERROR_CLASS_DEVICE_NOT_ACTIVE, "Device '%s' has not been activated"
+    ERROR_CLASS_DEVICE_NOT_ACTIVE, "No %s device has been activated"
 
 #define QERR_DEVICE_NOT_ENCRYPTED \
     ERROR_CLASS_GENERIC_ERROR, "Device '%s' is not encrypted"
@@ -160,7 +159,7 @@
     ERROR_CLASS_GENERIC_ERROR, "Invalid JSON syntax"
 
 #define QERR_KVM_MISSING_CAP \
-    ERROR_CLASS_K_V_M_MISSING_CAP, "Using KVM without %s, %s unavailable"
+    ERROR_CLASS_KVM_MISSING_CAP, "Using KVM without %s, %s unavailable"
 
 #define QERR_MIGRATION_ACTIVE \
     ERROR_CLASS_GENERIC_ERROR, "There's a migration process in progress"

qobject/qerror.c

diff --git a/qobject/qerror.c b/qobject/qerror.c
index fc8331a..17b051c 100644
--- a/qobject/qerror.c
+++ b/qobject/qerror.c
@@ -121,13 +121,6 @@
     }
 }
 
-void assert_no_error(Error *err)
-{
-    if (err) {
-        qerror_report_err(err);
-        abort();
-    }
-}
 
 /**
  * qobject_to_qerror(): Convert a QObject into a QError