From patchwork Mon Jan 7 07:28:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 209868 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 91FE22C0086 for ; Mon, 7 Jan 2013 18:30:33 +1100 (EST) Received: from localhost ([::1]:60782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ts7AF-0003dX-Lk for incoming@patchwork.ozlabs.org; Mon, 07 Jan 2013 02:30:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ts7A0-0003X6-E0 for qemu-devel@nongnu.org; Mon, 07 Jan 2013 02:30:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ts79y-0005Sf-OQ for qemu-devel@nongnu.org; Mon, 07 Jan 2013 02:30:16 -0500 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:51783) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ts79y-0005Rg-6c for qemu-devel@nongnu.org; Mon, 07 Jan 2013 02:30:14 -0500 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 7 Jan 2013 17:22:54 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 7 Jan 2013 17:22:52 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 03A5B357804D for ; Mon, 7 Jan 2013 18:30:10 +1100 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r077IgEn17563712 for ; Mon, 7 Jan 2013 18:18:42 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r077U82H021655 for ; Mon, 7 Jan 2013 18:30:09 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.237]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r077Rp6X018491; Mon, 7 Jan 2013 18:30:06 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2013 15:28:01 +0800 Message-Id: <1357543689-11415-4-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1357543689-11415-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1357543689-11415-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13010707-9264-0000-0000-000002F36615 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.146 Cc: kwolf@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, Wenchao Xia , lcapitulino@redhat.com, pbonzini@redhat.com, dietmar@proxmox.com Subject: [Qemu-devel] [PATCH V2 03/10] error: add function error_set_check() 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 This function will return instead of abort when *errp is not NULL. Also macro error_setg_check is added. Signed-off-by: Wenchao Xia --- error.c | 19 +++++++++++++++++++ include/qapi/error.h | 5 +++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/error.c b/error.c index 519f6b6..e4ec67c 100644 --- a/error.c +++ b/error.c @@ -43,6 +43,25 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...) *errp = err; } +void error_set_check(Error **errp, ErrorClass err_class, const char *fmt, ...) +{ + Error *err; + va_list ap; + + if ((errp == NULL) || (*errp != NULL)) { + return; + } + + 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/include/qapi/error.h b/include/qapi/error.h index 5cd2f0c..04b87a9 100644 --- a/include/qapi/error.h +++ b/include/qapi/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_check(Error **errp, 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 @@ -41,6 +44,8 @@ void error_set_errno(Error **err, int os_error, ErrorClass err_class, const char */ #define error_setg(err, fmt, ...) \ error_set(err, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__) +#define error_setg_check(err, fmt, ...) \ + error_set_check(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__)