From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54406 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pntqv-0001dg-MP for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pntqt-0003Zu-Vj for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pntqt-0003Zk-N7 for qemu-devel@nongnu.org; Fri, 11 Feb 2011 09:20:03 -0500 From: Kevin Wolf Date: Fri, 11 Feb 2011 15:21:30 +0100 Message-Id: <1297434094-24965-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1297434094-24965-1-git-send-email-kwolf@redhat.com> References: <1297434094-24965-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH STABLE 0.14 5/9] qerror: Add QERR_UNKNOWN_BLOCK_FORMAT_FEATURE List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: jmforbes@linuxtx.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Anthony Liguori (cherry picked from commit f54e3641122e51c6343d587805422642f307462e) --- qerror.c | 5 +++++ qerror.h | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/qerror.c b/qerror.c index 9d0cdeb..4855604 100644 --- a/qerror.c +++ b/qerror.c @@ -201,6 +201,11 @@ static const QErrorStringTable qerror_table[] = { .desc = "An undefined error has ocurred", }, { + .error_fmt = QERR_UNKNOWN_BLOCK_FORMAT_FEATURE, + .desc = "'%(device)' uses a %(format) feature which is not " + "supported by this qemu version: %(feature)", + }, + { .error_fmt = QERR_VNC_SERVER_FAILED, .desc = "Could not start VNC server on %(target)", }, diff --git a/qerror.h b/qerror.h index b0f69da..f732d45 100644 --- a/qerror.h +++ b/qerror.h @@ -165,6 +165,9 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_UNDEFINED_ERROR \ "{ 'class': 'UndefinedError', 'data': {} }" +#define QERR_UNKNOWN_BLOCK_FORMAT_FEATURE \ + "{ 'class': 'UnknownBlockFormatFeature', 'data': { 'device': %s, 'format': %s, 'feature': %s } }" + #define QERR_VNC_SERVER_FAILED \ "{ 'class': 'VNCServerFailed', 'data': { 'target': %s } }" -- 1.7.2.3