On Wed, Sep 01, 2021 at 11:41:53AM +0200, Cédric Le Goater wrote:
> This to avoid possible conflicts with the "id" property of QOM objects.
>
> Signed-off-by: Cédric Le Goater
Applied to ppc-for-6.2, thanks.
> ---
> include/hw/ppc/pnv_core.h | 2 +-
> hw/ppc/pnv.c | 4 ++--
> hw/ppc/pnv_core.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h
> index 6ecee98a76ed..c22eab2e1f69 100644
> --- a/include/hw/ppc/pnv_core.h
> +++ b/include/hw/ppc/pnv_core.h
> @@ -67,7 +67,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PnvQuad, PNV_QUAD)
> struct PnvQuad {
> DeviceState parent_obj;
>
> -uint32_t id;
> +uint32_t quad_id;
> MemoryRegion xscom_regs;
> };
> #endif /* PPC_PNV_CORE_H */
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 761b82be7401..93f76738fc94 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -1370,10 +1370,10 @@ static void pnv_chip_quad_realize(Pnv9Chip *chip9,
> Error **errp)
> sizeof(*eq), TYPE_PNV_QUAD,
> _fatal, NULL);
>
> -object_property_set_int(OBJECT(eq), "id", core_id, _fatal);
> +object_property_set_int(OBJECT(eq), "quad-id", core_id,
> _fatal);
> qdev_realize(DEVICE(eq), NULL, _fatal);
>
> -pnv_xscom_add_subregion(chip, PNV9_XSCOM_EQ_BASE(eq->id),
> +pnv_xscom_add_subregion(chip, PNV9_XSCOM_EQ_BASE(eq->quad_id),
> >xscom_regs);
> }
> }
> diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
> index 4de8414df212..19e8eb885f71 100644
> --- a/hw/ppc/pnv_core.c
> +++ b/hw/ppc/pnv_core.c
> @@ -407,13 +407,13 @@ static void pnv_quad_realize(DeviceState *dev, Error
> **errp)
> PnvQuad *eq = PNV_QUAD(dev);
> char name[32];
>
> -snprintf(name, sizeof(name), "xscom-quad.%d", eq->id);
> +snprintf(name, sizeof(name), "xscom-quad.%d", eq->quad_id);
> pnv_xscom_region_init(>xscom_regs, OBJECT(dev), _quad_xscom_ops,
>eq, name, PNV9_XSCOM_EQ_SIZE);
> }
>
> static Property pnv_quad_properties[] = {
> -DEFINE_PROP_UINT32("id", PnvQuad, id, 0),
> +DEFINE_PROP_UINT32("quad-id", PnvQuad, quad_id, 0),
> DEFINE_PROP_END_OF_LIST(),
> };
>
--
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
