From patchwork Mon Dec 17 06:25:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 206779 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0F91C2C008D for ; Mon, 17 Dec 2012 17:32:48 +1100 (EST) Received: from localhost ([::1]:43851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkUFq-00039C-5S for incoming@patchwork.ozlabs.org; Mon, 17 Dec 2012 01:32:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkUEf-0002oD-Av for qemu-devel@nongnu.org; Mon, 17 Dec 2012 01:32:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TkUAq-0006r4-Dz for qemu-devel@nongnu.org; Mon, 17 Dec 2012 01:31:33 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:39989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TkUAp-0006qs-RR for qemu-devel@nongnu.org; Mon, 17 Dec 2012 01:27:36 -0500 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 17 Dec 2012 16:24:49 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 17 Dec 2012 16:24:48 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 55B2A2CE804D for ; Mon, 17 Dec 2012 17:27:31 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBH6RUoS31653966 for ; Mon, 17 Dec 2012 17:27:30 +1100 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBH6RTNB031724 for ; Mon, 17 Dec 2012 17:27:30 +1100 Received: from RedHat62GAWSWenchao (wenchaox.cn.ibm.com [9.115.122.150]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBH6PGrg027846; Mon, 17 Dec 2012 17:27:28 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 17 Dec 2012 14:25:05 +0800 Message-Id: <1355725509-5429-3-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1355725509-5429-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1355725509-5429-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12121706-1396-0000-0000-0000024EEC9C X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.147 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, blauwirbel@gmail.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 2/6] snapshot: add error set function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Added two function which will try replace the error if it is already set, so only last error is reported. Signed-off-by: Wenchao Xia --- error.c | 23 +++++++++++++++++++++++ error.h | 9 +++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/error.c b/error.c index 128d88c..5a82f8e 100644 --- a/error.c +++ b/error.c @@ -43,6 +43,29 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...) *errp = err; } +void error_set_replace(Error **errp, ErrorClass err_class, const char *fmt, ...) +{ + Error *err; + va_list ap; + + if (errp == NULL) { + return; + } + if (*errp != NULL) { + error_free(*errp); + *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; + + *errp = err; +} + void error_set_errno(Error **errp, int os_errno, ErrorClass err_class, const char *fmt, ...) { diff --git a/error.h b/error.h index 4d52e73..8039408 100644 --- a/error.h +++ b/error.h @@ -29,6 +29,9 @@ typedef struct Error Error; */ void error_set(Error **err, ErrorClass err_class, const char *fmt, ...) GCC_FMT_ATTR(3, 4); +void error_set_replace(Error **err, ErrorClass err_class, const char *fmt, ...) +GCC_FMT_ATTR(3, 4); + /** * Set an indirect pointer to an error given a ErrorClass value and a * printf-style human message, followed by a strerror() string if @@ -43,6 +46,12 @@ void error_set_errno(Error **err, int os_error, ErrorClass err_class, const char error_set(err, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__) #define error_setg_errno(err, os_error, fmt, ...) \ error_set_errno(err, os_error, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__) +#define error_setg_replace(err, fmt, ...) do { \ + if (*err != NULL) { \ + error_free(*err); \ + } \ + error_set(err, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__); \ +} while (/*CONSTCOND*/0) /** * Returns true if an indirect pointer to an error is pointing to a valid