[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 03/20] nubus-device: add device slot parameter
From: |
Laurent Vivier |
Subject: |
Re: [PATCH v4 03/20] nubus-device: add device slot parameter |
Date: |
Mon, 20 Sep 2021 19:31:02 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 |
Le 17/09/2021 à 09:50, Mark Cave-Ayland a écrit :
> This prepares for allowing Nubus devices to be placed in a specific slot
> instead
> of always being auto-allocated by the bus itself.
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
> hw/nubus/nubus-device.c | 6 ++++++
> include/hw/nubus/nubus.h | 2 +-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
> index 36203848e5..c1832f73da 100644
> --- a/hw/nubus/nubus-device.c
> +++ b/hw/nubus/nubus-device.c
> @@ -191,12 +191,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 = {
> diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
> index 89b0976aaa..357f621d15 100644
> --- a/include/hw/nubus/nubus.h
> +++ b/include/hw/nubus/nubus.h
> @@ -42,7 +42,7 @@ struct NubusBus {
> struct NubusDevice {
> DeviceState qdev;
>
> - int slot;
> + int32_t slot;
> MemoryRegion super_slot_mem;
> MemoryRegion slot_mem;
>
>
I think this patch should be merged with the following one because slot is
simply ignored for the
moment as it is overwritten in nubus_device_realize().
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
- [PATCH v4 00/20] nubus: bus, device, bridge, IRQ and address space improvements, Mark Cave-Ayland, 2021/09/17
- [PATCH v4 01/20] nubus-device: rename slot_nb variable to slot, Mark Cave-Ayland, 2021/09/17
- [PATCH v4 02/20] nubus-device: expose separate super slot memory region, Mark Cave-Ayland, 2021/09/17
- [PATCH v4 03/20] nubus-device: add device slot parameter, Mark Cave-Ayland, 2021/09/17
- Re: [PATCH v4 03/20] nubus-device: add device slot parameter,
Laurent Vivier <=
- [PATCH v4 04/20] nubus: use bitmap to manage available slots, Mark Cave-Ayland, 2021/09/17
- [PATCH v4 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address(), Mark Cave-Ayland, 2021/09/17
- [PATCH v4 06/20] nubus: implement BusClass get_dev_path(), Mark Cave-Ayland, 2021/09/17
- [PATCH v4 11/20] nubus-device: add romfile property for loading declaration ROMs, Mark Cave-Ayland, 2021/09/17