From patchwork Wed Feb 24 17:55: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: 46182 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 45DEDB7CE7 for ; Thu, 25 Feb 2010 05:53:31 +1100 (EST) Received: from localhost ([127.0.0.1]:54287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkMKs-0002dw-Am for incoming@patchwork.ozlabs.org; Wed, 24 Feb 2010 13:51:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkLcP-0002Cq-O9 for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:53 -0500 Received: from [199.232.76.173] (port=52969 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLcO-0002CL-8k for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:52 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkLcG-0000S6-EI for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:51 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:55084) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NkLcB-0000QU-92 for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:39 -0500 Received: from blackfin.pond.sub.org (pD9E38C12.dip.t-dialin.net [217.227.140.18]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 5CCCB3127AD for ; Wed, 24 Feb 2010 18:56:05 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 87472110; Wed, 24 Feb 2010 18:56:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 24 Feb 2010 18:55:44 +0100 Message-Id: <1267034160-3517-33-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1267034160-3517-1-git-send-email-armbru@redhat.com> References: <1267034160-3517-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH RFC 32/48] error: New QERR_DEVICE_MULTIPLE_BUSSES 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 51b68bc..56407be 100644 --- a/qerror.c +++ b/qerror.c @@ -57,6 +57,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "Device '%(device)' is locked", }, { + .error_fmt = QERR_DEVICE_MULTIPLE_BUSSES, + .desc = "Device '%(device)' has multiple child busses", + }, + { .error_fmt = QERR_DEVICE_NOT_ACTIVE, .desc = "Device '%(device)' has not been activated by the guest", }, diff --git a/qerror.h b/qerror.h index 2f06dc7..2b31a8d 100644 --- a/qerror.h +++ b/qerror.h @@ -54,6 +54,9 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_DEVICE_LOCKED \ "{ 'class': 'DeviceLocked', 'data': { 'device': %s } }" +#define QERR_DEVICE_MULTIPLE_BUSSES \ + "{ 'class': 'DeviceMultipleBusses', 'data': { 'device': %s } }" + #define QERR_DEVICE_NOT_ACTIVE \ "{ 'class': 'DeviceNotActive', 'data': { 'device': %s } }"