From patchwork Thu Mar 25 16:22:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 48536 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 A91AAB7CEF for ; Fri, 26 Mar 2010 03:40:21 +1100 (EST) Received: from localhost ([127.0.0.1]:48323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nuq6U-0005JM-UO for incoming@patchwork.ozlabs.org; Thu, 25 Mar 2010 12:40:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nuppg-0005gM-Cl for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:22:56 -0400 Received: from [140.186.70.92] (port=35957 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuppY-0005XY-ER for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:22:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuppU-0001Ej-0V for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:22:47 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:52303) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuppT-0001DK-MM for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:22:43 -0400 Received: from blackfin.pond.sub.org (pD9E38AC7.dip.t-dialin.net [217.227.138.199]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 6CF5E276DAA for ; Thu, 25 Mar 2010 17:22:41 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 96EFC7F; Thu, 25 Mar 2010 17:22:40 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 25 Mar 2010 17:22:31 +0100 Message-Id: <1269534160-4550-3-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1269534160-4550-1-git-send-email-armbru@redhat.com> References: <1269534160-4550-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v3 02/11] error: New QERR_DUPLICATE_ID 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 Signed-off-by: Markus Armbruster --- qerror.c | 4 ++++ qerror.h | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/qerror.c b/qerror.c index 4520b0d..9fb817e 100644 --- a/qerror.c +++ b/qerror.c @@ -97,6 +97,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "Device '%(device)' has no child bus", }, { + .error_fmt = QERR_DUPLICATE_ID, + .desc = "Duplicate ID '%(id)' for %(object)", + }, + { .error_fmt = QERR_FD_NOT_FOUND, .desc = "File descriptor named '%(name)' not found", }, diff --git a/qerror.h b/qerror.h index a2664ab..870cdc3 100644 --- a/qerror.h +++ b/qerror.h @@ -88,6 +88,9 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_DEVICE_NO_BUS \ "{ 'class': 'DeviceNoBus', 'data': { 'device': %s } }" +#define QERR_DUPLICATE_ID \ + "{ 'class': 'DuplicateId', 'data': { 'id': %s, 'object': %s } }" + #define QERR_FD_NOT_FOUND \ "{ 'class': 'FdNotFound', 'data': { 'name': %s } }"