error: Implement the warn and free Error functions

Implement warn_report_err() and warn_reportf_err() functions which
are the same as the error_report_err() and error_reportf_err()
functions except report a warning instead of an error.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <276ff93eadc0b01b8243cc61ffc331f77922c0d0.1499866456.git.alistair.francis@xilinx.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>

diff --git a/include/qapi/error.h b/include/qapi/error.h
index 7e532d00e9c8e092f9a01aa098f27a225dce856d..af53b34410ee97dfedf31e03d54d07a03c470f51 100644 (file)
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -266,11 +266,22 @@ void error_free(Error *err);
  */
 void error_free_or_abort(Error **errp);
 
+/*
+ * Convenience function to warn_report() and free @err.
+ */
+void warn_report_err(Error *err);
+
 /*
  * Convenience function to error_report() and free @err.
  */
 void error_report_err(Error *err);
 
+/*
+ * Convenience function to error_prepend(), warn_report() and free @err.
+ */
+void warn_reportf_err(Error *err, const char *fmt, ...)
+    GCC_FMT_ATTR(2, 3);
+
 /*
  * Convenience function to error_prepend(), error_report() and free @err.
  */

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 9287cc588618bddf39cf81cdca22bd0ac69b9b86..4e911228137cb909bfc9803dd7cccabff402d67f 100755 (executable)
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2533,6 +2533,7 @@ sub process {
                                error_setg_file_open|
                                error_set|
                                error_prepend|
+                               warn_reportf_err|
                                error_reportf_err|
                                error_vreport|
                                warn_vreport|

diff --git a/util/error.c b/util/error.c
index 020b86b9f09116a2c2f69ab1673f8653a57e7e67..3efdd69162b57f7e81f2df56f5f15d64a6fad595 100644 (file)
--- a/util/error.c
+++ b/util/error.c
@@ -232,6 +232,15 @@ void error_report_err(Error *err)
     error_free(err);
 }
 
+void warn_report_err(Error *err)
+{
+    warn_report("%s", error_get_pretty(err));
+    if (err->hint) {
+        error_printf_unless_qmp("%s", err->hint->str);
+    }
+    error_free(err);
+}
+
 void error_reportf_err(Error *err, const char *fmt, ...)
 {
     va_list ap;
@@ -242,6 +251,17 @@ void error_reportf_err(Error *err, const char *fmt, ...)
     error_report_err(err);
 }
 
+
+void warn_reportf_err(Error *err, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    error_vprepend(&err, fmt, ap);
+    va_end(ap);
+    warn_report_err(err);
+}
+
 void error_free(Error *err)
 {
     if (err) {