[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH 4/9] hw/arm/bcm2386: Fix parent type of bcm2386
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-arm] [PATCH 4/9] hw/arm/bcm2386: Fix parent type of bcm2386 |
Date: |
Wed, 14 Mar 2018 00:04:12 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 |
On 03/13/2018 04:34 PM, Peter Maydell wrote:
> The TypeInfo and state struct for bcm2386 disagree about what the
> parent class is -- the TypeInfo says it's TYPE_SYS_BUS_DEVICE,
> but the BCM2386State struct only defines the parent_obj field
> as DeviceState. This would have caused problems if anything
> actually tried to treat the object as a TYPE_SYS_BUS_DEVICE.
> Fix the TypeInfo to use TYPE_DEVICE as the parent, since we don't
> need any of the additional functionality TYPE_SYS_BUS_DEVICE
> provides.
I once wondered if we can dump the whole devices hierarchy (xml format)
and check consistency, or generate hyperlink doc and graph for the wiki...
>
> Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> I noticed this when I tried to make the type into one which
> has its own class struct, because we hit the assert that the
> child's class struct had better be bigger than the parent's.
Yeah once you understand this obscure assert(), it is VERY useful.
> ---
> hw/arm/bcm2836.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
> index 40e8b25a46..9266f27c14 100644
> --- a/hw/arm/bcm2836.c
> +++ b/hw/arm/bcm2836.c
> @@ -165,7 +165,7 @@ static void bcm2836_class_init(ObjectClass *oc, void
> *data)
>
> static const TypeInfo bcm2836_type_info = {
> .name = TYPE_BCM2836,
> - .parent = TYPE_SYS_BUS_DEVICE,
> + .parent = TYPE_DEVICE,
> .instance_size = sizeof(BCM2836State),
> .instance_init = bcm2836_init,
> .class_init = bcm2836_class_init,
>
- Re: [Qemu-arm] [PATCH 7/9] hw/arm/bcm2836: Use correct affinity values for BCM2837, (continued)
- [Qemu-arm] [PATCH 6/9] hw/arm/bcm2836: Create proper bcm2837 device, Peter Maydell, 2018/03/13
- [Qemu-arm] [PATCH 5/9] hw/arm/bcm2836: Rename bcm2836 type/struct to bcm283x, Peter Maydell, 2018/03/13
- [Qemu-arm] [PATCH 4/9] hw/arm/bcm2386: Fix parent type of bcm2386, Peter Maydell, 2018/03/13
- [Qemu-arm] [PATCH 3/9] hw/arm/boot: If booting a kernel in EL2, set SCR_EL3.HCE, Peter Maydell, 2018/03/13
- [Qemu-arm] [PATCH 2/9] hw/arm/boot: assert that secure_boot and secure_board_setup are false for AArch64, Peter Maydell, 2018/03/13