From patchwork Fri Nov 30 17:12:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 203002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 469762C009A for ; Sat, 1 Dec 2012 04:12:04 +1100 (EST) Received: from localhost ([::1]:44437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeU89-0002JQ-C8 for incoming@patchwork.ozlabs.org; Fri, 30 Nov 2012 12:12:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeU7w-0002JK-Ot for qemu-devel@nongnu.org; Fri, 30 Nov 2012 12:11:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TeU7v-0000QX-HJ for qemu-devel@nongnu.org; Fri, 30 Nov 2012 12:11:48 -0500 Received: from greensocs.com ([87.106.252.221]:41212 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeU7v-0000QT-AU for qemu-devel@nongnu.org; Fri, 30 Nov 2012 12:11:47 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 930E040F4C8; Fri, 30 Nov 2012 17:11:46 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pdqaMYimx5xe; Fri, 30 Nov 2012 18:11:46 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 432A640F4C9; Fri, 30 Nov 2012 18:11:46 +0100 (CET) Received: from localhost.localdomain (214.155.72.86.rev.sfr.net [86.72.155.214]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id 192C040F4C8; Fri, 30 Nov 2012 18:11:45 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Fri, 30 Nov 2012 18:12:05 +0100 Message-Id: <1354295530-18644-2-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1354295530-18644-1-git-send-email-fred.konrad@greensocs.com> References: <1354295530-18644-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, e.voevodin@samsung.com, mark.burton@greensocs.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH V4 1/6] qdev : add a maximum device allowed field for the bus. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: KONRAD Frederic Only one device can be connected to virtio-bus. This patch add a field max_dev which is : * the maximum amount of devices connected on the bus ( when * max_dev!=0 ). * have no effect ( when max_dev=0 ). The function qbus_find_recursive is modified : * to return a non full bus when the "bus=" option is not present. * to give an error when the "bus=" option is pointing a full bus. Signed-off-by: KONRAD Frederic --- hw/qdev-core.h | 2 ++ hw/qdev-monitor.c | 11 +++++++++++ qerror.h | 3 +++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/hw/qdev-core.h b/hw/qdev-core.h index fff7f0f..f5019b1 100644 --- a/hw/qdev-core.h +++ b/hw/qdev-core.h @@ -113,6 +113,8 @@ struct BusState { const char *name; int allow_hotplug; int max_index; + /* maximum devices allowed on the bus. */ + int max_dev; QTAILQ_HEAD(ChildrenHead, BusChild) children; QLIST_ENTRY(BusState) sibling; }; diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index a1b4d6a..4471b3a 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -292,6 +292,17 @@ static BusState *qbus_find_recursive(BusState *bus, const char *name, if (bus_typename && !object_dynamic_cast(OBJECT(bus), bus_typename)) { match = 0; } + /* Check if max_dev is reached */ + if ((bus->max_dev != 0) && (bus->max_dev <= bus->max_index)) { + if (name != NULL) { + /* bus was explicitly specified : return an error. */ + qerror_report(QERR_BUS_IS_FULL, bus->name); + return NULL; + } else { + /* bus was not specified : try to find another one. */ + match = 0; + } + } if (match) { return bus; } diff --git a/qerror.h b/qerror.h index 8db4309..b159828 100644 --- a/qerror.h +++ b/qerror.h @@ -69,6 +69,9 @@ void assert_no_error(Error *err); #define QERR_BUS_NOT_FOUND \ ERROR_CLASS_GENERIC_ERROR, "Bus '%s' not found" +#define QERR_BUS_IS_FULL \ + ERROR_CLASS_GENERIC_ERROR, "Bus '%s' is full" + #define QERR_COMMAND_DISABLED \ ERROR_CLASS_GENERIC_ERROR, "The command %s has been disabled for this instance"