From patchwork Mon Mar 22 09:48:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 48280 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 C03D7B7D08 for ; Mon, 22 Mar 2010 21:29:10 +1100 (EST) Received: from localhost ([127.0.0.1]:40816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nter7-00057A-Ae for incoming@patchwork.ozlabs.org; Mon, 22 Mar 2010 06:27:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NteFy-0006fx-D5 for qemu-devel@nongnu.org; Mon, 22 Mar 2010 05:49:10 -0400 Received: from [199.232.76.173] (port=57964 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NteFx-0006fI-CQ for qemu-devel@nongnu.org; Mon, 22 Mar 2010 05:49:09 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NteFl-0007Rc-R0 for qemu-devel@nongnu.org; Mon, 22 Mar 2010 05:49:09 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:54248) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NteFl-0007R0-0O for qemu-devel@nongnu.org; Mon, 22 Mar 2010 05:48:57 -0400 Received: from blackfin.pond.sub.org (pD951ABC6.dip.t-dialin.net [217.81.171.198]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 15B6E276DA6 for ; Mon, 22 Mar 2010 10:48:54 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 9F9F2DC; Mon, 22 Mar 2010 10:48:53 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 22 Mar 2010 10:48:44 +0100 Message-Id: <1269251333-20821-3-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1269251333-20821-1-git-send-email-armbru@redhat.com> References: <1269251333-20821-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2 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 } }"