From patchwork Mon Jan 7 18:40:14 2013 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: 210031 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 A395C2C0080 for ; Tue, 8 Jan 2013 05:41:59 +1100 (EST) Received: from localhost ([::1]:45248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHe1-0003Uv-Dj for incoming@patchwork.ozlabs.org; Mon, 07 Jan 2013 13:41:57 -0500 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 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id E5233439E38; Mon, 7 Jan 2013 18:41:30 +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 jywpLFuhlZ1E; Mon, 7 Jan 2013 19:41:29 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id E791B439E33; Mon, 7 Jan 2013 19:41:28 +0100 (CET) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id B4FBB400091; Mon, 7 Jan 2013 19:41:27 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Mon, 7 Jan 2013 19:40:14 +0100 Message-Id: <1357584074-10852-2-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> References: <1357584074-10852-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: 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 Subject: [Qemu-devel] [PATCH 01/61] 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 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 Reviewed-by: Peter Maydell --- 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; }