From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHdg-0003NU-Jo for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:41:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsHdc-0005f3-D3 for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:41:36 -0500 Received: from greensocs.com ([87.106.252.221]:52588 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHdc-0005eq-4b for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:41:32 -0500 From: fred.konrad@greensocs.com Date: Mon, 7 Jan 2013 19:40:14 +0100 Message-Id: <1357584074-10852-2-git-send-email-fred.konrad@greensocs.com> In-Reply-To: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> References: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> Subject: [Qemu-devel] [PATCH 01/61] 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, aliguori@us.ibm.com Cc: kwolf@redhat.com, peter.maydell@linaro.org, e.voevodin@samsung.com, mst@redhat.com, mark.burton@greensocs.com, agraf@suse.de, amit.shah@redhat.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com From: KONRAD Frederic Add a max_dev field to BusClass 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 | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/hw/qdev-core.h b/hw/qdev-core.h index fdf14ec..8bcaeac 100644 --- a/hw/qdev-core.h +++ b/hw/qdev-core.h @@ -87,6 +87,8 @@ struct BusClass { */ char *(*get_fw_dev_path)(DeviceState *dev); int (*reset)(BusState *bus); + /* maximum devices allowed on the bus, 0 : no limit. */ + int max_dev; }; typedef struct BusChild { diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index b739867..9e9d840 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -283,6 +283,7 @@ static DeviceState *qbus_find_dev(BusState *bus, char *elem) static BusState *qbus_find_recursive(BusState *bus, const char *name, const char *bus_typename) { + BusClass *bus_class = BUS_GET_CLASS(bus); BusChild *kid; BusState *child, *ret; int match = 1; @@ -293,6 +294,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_class->max_dev != 0) && (bus_class->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