[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC V9 01/12] qdev : add a maximum device allowed field fo
From: |
fred . konrad |
Subject: |
[Qemu-devel] [RFC V9 01/12] qdev : add a maximum device allowed field for the bus. |
Date: |
Thu, 3 Jan 2013 15:52:13 +0100 |
From: KONRAD Frederic <address@hidden>
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 <address@hidden>
---
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 fdf14ec..73e25d8 100644
--- a/hw/qdev-core.h
+++ b/hw/qdev-core.h
@@ -104,6 +104,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 b739867..817562e 100644
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -293,6 +293,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
- [Qemu-devel] [RFC V9 00/12] Virtio refactoring., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 01/12] qdev : add a maximum device allowed field for the bus.,
fred . konrad <=
- [Qemu-devel] [RFC V9 06/12] virtio-s390-bus : add virtio-s390-bus., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 03/12] virtio-pci-bus : introduce virtio-pci-bus., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 07/12] virtio-s390-device : create a virtio-s390-bus during init., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 05/12] virtio-device : refactor virtio-device., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 02/12] virtio-bus : introduce virtio-bus, fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 04/12] virtio-pci : refactor virtio-pci device., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 08/12] virtio-blk : add the virtio-blk device., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 10/12] virtio-blk-s390 : switch to the new API., fred . konrad, 2013/01/03