From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tgy2t-0003v8-UW for qemu-devel@nongnu.org; Fri, 07 Dec 2012 08:32:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tgy2m-00078X-5S for qemu-devel@nongnu.org; Fri, 07 Dec 2012 08:32:51 -0500 Received: from greensocs.com ([87.106.252.221]:54726 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tgy2l-00078T-VU for qemu-devel@nongnu.org; Fri, 07 Dec 2012 08:32:44 -0500 From: fred.konrad@greensocs.com Date: Fri, 7 Dec 2012 14:32:30 +0100 Message-Id: <1354887155-32281-2-git-send-email-fred.konrad@greensocs.com> In-Reply-To: <1354887155-32281-1-git-send-email-fred.konrad@greensocs.com> References: <1354887155-32281-1-git-send-email-fred.konrad@greensocs.com> Subject: [Qemu-devel] [RFC PATCH v6 1/6] qdev : add a maximum device allowed field for the bus. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 From: KONRAD Frederic Add a max_dev field to BusState to specify the maximum amount of devices allowed on the bus ( have no effect if max_dev=0 ) Signed-off-by: KONRAD Frederic --- hw/qdev-core.h | 2 ++ hw/qdev-monitor.c | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/hw/qdev-core.h b/hw/qdev-core.h index fff7f0f..ee4becd 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, 0 : no limit. */ + 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..7a9d275 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; } + if ((bus->max_dev != 0) && (bus->max_dev <= bus->max_index)) { + if (name != NULL) { + /* bus was explicitly specified : return an error. */ + qerror_report(ERROR_CLASS_GENERIC_ERROR, "Bus '%s' is full", + bus->name); + return NULL; + } else { + /* bus was not specified : try to find another one. */ + match = 0; + } + } if (match) { return bus; } -- 1.7.11.7