[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V11 3/8] util: add error_append()
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V11 3/8] util: add error_append() |
Date: |
Tue, 11 Feb 2014 14:23:03 -0500 |
Some old code in error_set() is factored out, so this function can
call it.
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
include/qapi/error.h | 6 ++++++
util/error.c | 44 +++++++++++++++++++++++++++++++++++++++-----
2 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/include/qapi/error.h b/include/qapi/error.h
index c0f0c3b..b36236e 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -30,6 +30,12 @@ typedef struct Error Error;
void error_set(Error **err, ErrorClass err_class, const char *fmt, ...)
GCC_FMT_ATTR(3, 4);
/**
+ * Append message to err if errp != NULL. If errp is already set, "\n" will be
inserted
+ * after old message. If errp is not set yet, it is same as error_setg().
+ */
+void error_append(Error **errp, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
+
+/**
* Set an indirect pointer to an error given a ErrorClass value and a
* printf-style human message, followed by a strerror() string if
* @os_error is not zero.
diff --git a/util/error.c b/util/error.c
index f11f1d5..5053650 100644
--- a/util/error.c
+++ b/util/error.c
@@ -25,10 +25,12 @@ struct Error
Error *error_abort;
-void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
+static void error_vset(Error **errp,
+ ErrorClass err_class,
+ const char *fmt,
+ va_list ap)
{
Error *err;
- va_list ap;
int saved_errno = errno;
if (errp == NULL) {
@@ -37,10 +39,7 @@ void error_set(Error **errp, ErrorClass err_class, const
char *fmt, ...)
assert(*errp == NULL);
err = g_malloc0(sizeof(*err));
-
- va_start(ap, fmt);
err->msg = g_strdup_vprintf(fmt, ap);
- va_end(ap);
err->err_class = err_class;
if (errp == &error_abort) {
@@ -53,6 +52,41 @@ void error_set(Error **errp, ErrorClass err_class, const
char *fmt, ...)
errno = saved_errno;
}
+void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ error_vset(errp, err_class, fmt, ap);
+ va_end(ap);
+}
+
+void error_append(Error **errp, const char *fmt, ...)
+{
+ va_list ap;
+ Error *err_old;
+ gchar *msg;
+
+ if (error_is_set(errp)) {
+ err_old = *errp;
+ *errp = NULL;
+ va_start(ap, fmt);
+ msg = g_strdup_vprintf(fmt, ap);
+ va_end(ap);
+
+ error_set(errp, err_old->err_class,
+ "%s\n%s", error_get_pretty(err_old), msg);
+
+ g_free(msg);
+ error_free(err_old);
+ return;
+ }
+
+ va_start(ap, fmt);
+ error_vset(errp, ERROR_CLASS_GENERIC_ERROR, fmt, ap);
+ va_end(ap);
+}
+
void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
const char *fmt, ...)
{
--
1.7.1
- [Qemu-devel] [PATCH V11 0/8] qcow2: rollback the modification on fail in snapshot creation, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V11 1/8] snapshot: add parameter *errp in snapshot create, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V11 2/8] qcow2: add error message in qcow2_write_snapshots(), Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V11 3/8] util: add error_append(),
Wenchao Xia <=
- [Qemu-devel] [PATCH V11 4/8] qcow2: return int for qcow2_free_clusters(), Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V11 5/8] qcow2: full rollback on fail in qcow2_write_snapshots(), Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V11 8/8] qemu-iotests: add test for qcow2 snapshot, Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V11 6/8] qcow2: rollback on fail in qcow2_snapshot_create(), Wenchao Xia, 2014/02/11
- [Qemu-devel] [PATCH V11 7/8] blkdebug: add debug events for snapshot, Wenchao Xia, 2014/02/11
- Re: [Qemu-devel] [PATCH V11 0/8] qcow2: rollback the modification on fail in snapshot creation, Wenchao Xia, 2014/02/13
- Re: [Qemu-devel] [PATCH V11 0/8] qcow2: rollback the modification on fail in snapshot creation, Wenchao Xia, 2014/02/20