aboutsummaryrefslogtreecommitdiff
path: root/hw/nubus/nubus-device.c
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2021-09-24 08:37:52 +0100
committerLaurent Vivier <laurent@vivier.eu>2021-09-29 10:45:19 +0200
commit03deab99401a57332d8f3bdba319a41eebc1d666 (patch)
tree180f08b183953f00a2f0628e8daabd7d80442fda /hw/nubus/nubus-device.c
parent90be1dea5017e518076f2a0d3ad26e158b92a1da (diff)
downloadqemu-03deab99401a57332d8f3bdba319a41eebc1d666.zip
qemu-03deab99401a57332d8f3bdba319a41eebc1d666.tar.gz
qemu-03deab99401a57332d8f3bdba319a41eebc1d666.tar.bz2
nubus: use bitmap to manage available slots
Convert nubus_device_realize() to use a bitmap to manage available slots to allow for future Nubus devices to be plugged into arbitrary slots from the command line using a new qdev "slot" parameter for nubus devices. Update mac_nubus_bridge_init() to only allow slots 0x9 to 0xe on Macintosh machines as documented in "Designing Cards and Drivers for the Macintosh Family". Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20210924073808.1041-5-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'hw/nubus/nubus-device.c')
-rw-r--r--hw/nubus/nubus-device.c29
1 files changed, 24 insertions, 5 deletions
diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index 4e23df1..2e96d6b 100644
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -161,13 +161,26 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
char *name;
hwaddr slot_offset;
- if (nubus->current_slot < NUBUS_FIRST_SLOT ||
- nubus->current_slot > NUBUS_LAST_SLOT) {
- error_setg(errp, "Cannot register nubus card, not enough slots");
- return;
+ if (nd->slot == -1) {
+ /* No slot specified, find first available free slot */
+ int s = ctz32(nubus->slot_available_mask);
+ if (s != 32) {
+ nd->slot = s;
+ } else {
+ error_setg(errp, "Cannot register nubus card, no free slot "
+ "available");
+ return;
+ }
+ } else {
+ /* Slot specified, make sure the slot is available */
+ if (!(nubus->slot_available_mask & BIT(nd->slot))) {
+ error_setg(errp, "Cannot register nubus card, slot %d is "
+ "unavailable or already occupied", nd->slot);
+ return;
+ }
}
- nd->slot = nubus->current_slot++;
+ nubus->slot_available_mask &= ~BIT(nd->slot);
/* Super */
slot_offset = nd->slot * NUBUS_SUPER_SLOT_SIZE;
@@ -191,12 +204,18 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
nubus_register_format_block(nd);
}
+static Property nubus_device_properties[] = {
+ DEFINE_PROP_INT32("slot", NubusDevice, slot, -1),
+ DEFINE_PROP_END_OF_LIST()
+};
+
static void nubus_device_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
dc->realize = nubus_device_realize;
dc->bus_type = TYPE_NUBUS_BUS;
+ device_class_set_props(dc, nubus_device_properties);
}
static const TypeInfo nubus_device_type_info = {