motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 10:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

nubus: use bitmap to manage available slots

Browse source 
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>
This commit is contained in:
Mark Cave-Ayland 2021-09-24 08:37:52 +01:00 • committed by Laurent Vivier
parent 90be1dea50
commit 03deab9940
5 changed files with 41 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
hw/nubus/nubus-device.c
View file

@ -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 = {