From patchwork Mon Mar 7 01:22:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 85629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9EBFEB70FF for ; Mon, 7 Mar 2011 12:40:58 +1100 (EST) Received: from localhost ([127.0.0.1]:56746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwPRO-000793-RE for incoming@patchwork.ozlabs.org; Sun, 06 Mar 2011 20:40:54 -0500 Received: from [140.186.70.92] (port=47538 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwPAX-0007Wd-Io for qemu-devel@nongnu.org; Sun, 06 Mar 2011 20:23:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PwPAP-0000NW-SL for qemu-devel@nongnu.org; Sun, 06 Mar 2011 20:23:29 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:43914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PwPAP-0000MT-I1 for qemu-devel@nongnu.org; Sun, 06 Mar 2011 20:23:21 -0500 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p270wuJt010531 for ; Sun, 6 Mar 2011 19:58:56 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id D15336E8036 for ; Sun, 6 Mar 2011 20:23:12 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p271NCCW324380 for ; Sun, 6 Mar 2011 20:23:12 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p271NCSq020490 for ; Sun, 6 Mar 2011 20:23:12 -0500 Received: from localhost.localdomain (sig-9-65-217-198.mts.ibm.com [9.65.217.198]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p271N9MJ020370; Sun, 6 Mar 2011 20:23:11 -0500 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Sun, 6 Mar 2011 19:22:44 -0600 Message-Id: <1299460984-15849-3-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1299460984-15849-1-git-send-email-aliguori@us.ibm.com> References: <1299460984-15849-1-git-send-email-aliguori@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.146 Cc: Adam Litke , Anthony Liguori , Markus Armbruster , Luiz Capitulino Subject: [Qemu-devel] [PATCH 02/22] qerror: expose a function to format an error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This will let Error share the QError human formatting. This is only used for HMP. Signed-off-by: Anthony Liguori diff --git a/qerror.c b/qerror.c index 4855604..13d53c9 100644 --- a/qerror.c +++ b/qerror.c @@ -326,12 +326,18 @@ QError *qerror_from_info(const char *file, int linenr, const char *func, return qerr; } -static void parse_error(const QError *qerror, int c) +static void parse_error(const QErrorStringTable *entry, int c) { - qerror_abort(qerror, "expected '%c' in '%s'", c, qerror->entry->desc); +#if 0 + qerror_abort(qerror, "expected '%c' in '%s'", c, entry->desc); +#else + fprintf(stderr, "expected '%c' in '%s'", c, entry->desc); + abort(); +#endif } -static const char *append_field(QString *outstr, const QError *qerror, +static const char *append_field(QDict *error, QString *outstr, + const QErrorStringTable *entry, const char *start) { QObject *obj; @@ -339,24 +345,31 @@ static const char *append_field(QString *outstr, const QError *qerror, QString *key_qs; const char *end, *key; - if (*start != '%') - parse_error(qerror, '%'); + if (*start != '%') { + parse_error(entry, '%'); + } start++; - if (*start != '(') - parse_error(qerror, '('); + if (*start != '(') { + parse_error(entry, '('); + } start++; end = strchr(start, ')'); - if (!end) - parse_error(qerror, ')'); + if (!end) { + parse_error(entry, ')'); + } key_qs = qstring_from_substr(start, 0, end - start - 1); key = qstring_get_str(key_qs); - qdict = qobject_to_qdict(qdict_get(qerror->error, "data")); + qdict = qobject_to_qdict(qdict_get(error, "data")); obj = qdict_get(qdict, key); if (!obj) { +#if 0 qerror_abort(qerror, "key '%s' not found in QDict", key); +#else + abort(); +#endif } switch (qobject_type(obj)) { @@ -367,41 +380,66 @@ static const char *append_field(QString *outstr, const QError *qerror, qstring_append_int(outstr, qdict_get_int(qdict, key)); break; default: +#if 0 qerror_abort(qerror, "invalid type '%c'", qobject_type(obj)); +#else + abort(); +#endif } QDECREF(key_qs); return ++end; } -/** - * qerror_human(): Format QError data into human-readable string. - * - * Formats according to member 'desc' of the specified QError object. - */ -QString *qerror_human(const QError *qerror) +static QString *qerror_format_desc(QDict *error, + const QErrorStringTable *entry) { - const char *p; QString *qstring; + const char *p; - assert(qerror->entry != NULL); + assert(entry != NULL); qstring = qstring_new(); - for (p = qerror->entry->desc; *p != '\0';) { + for (p = entry->desc; *p != '\0';) { if (*p != '%') { qstring_append_chr(qstring, *p++); } else if (*(p + 1) == '%') { qstring_append_chr(qstring, '%'); p += 2; } else { - p = append_field(qstring, qerror, p); + p = append_field(error, qstring, entry, p); } } return qstring; } +QString *qerror_format(const char *fmt, QDict *error) +{ + const QErrorStringTable *entry = NULL; + int i; + + for (i = 0; qerror_table[i].error_fmt; i++) { + if (strcmp(qerror_table[i].error_fmt, fmt) == 0) { + entry = &qerror_table[i]; + break; + } + } + + return qerror_format_desc(error, entry); +} + +/** + * qerror_human(): Format QError data into human-readable string. + * + * Formats according to member 'desc' of the specified QError object. + */ +QString *qerror_human(const QError *qerror) +{ + return qerror_format_desc(qerror->error, qerror->entry); +} + /** * qerror_print(): Print QError data * diff --git a/qerror.h b/qerror.h index f732d45..fd63ee9 100644 --- a/qerror.h +++ b/qerror.h @@ -42,6 +42,7 @@ void qerror_report_internal(const char *file, int linenr, const char *func, #define qerror_report(fmt, ...) \ qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__) QError *qobject_to_qerror(const QObject *obj); +QString *qerror_format(const char *fmt, QDict *error); /* * QError class list