All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: "Cédric Le Goater" <clg@kaod.org>
Cc: qemu-ppc@nongnu.org, Greg Kurz <groug@kaod.org>, qemu-devel@nongnu.org
Subject: Re: [PATCH 8/8] ppc/pnv: Rename "id" to "quad-id" in PnvQuad
Date: Thu, 2 Sep 2021 11:39:31 +1000	[thread overview]
Message-ID: <YTArU/F/ijVDgJi3@yekko> (raw)
In-Reply-To: <20210901094153.227671-9-clg@kaod.org>

[-- Attachment #1: Type: text/plain, Size: 2634 bytes --]

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 <clg@kaod.org>

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,
>                                             &error_fatal, NULL);
>  
> -        object_property_set_int(OBJECT(eq), "id", core_id, &error_fatal);
> +        object_property_set_int(OBJECT(eq), "quad-id", core_id, &error_fatal);
>          qdev_realize(DEVICE(eq), NULL, &error_fatal);
>  
> -        pnv_xscom_add_subregion(chip, PNV9_XSCOM_EQ_BASE(eq->id),
> +        pnv_xscom_add_subregion(chip, PNV9_XSCOM_EQ_BASE(eq->quad_id),
>                                  &eq->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(&eq->xscom_regs, OBJECT(dev), &pnv_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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

      reply	other threads:[~2021-09-02  3:42 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-01  9:41 [PATCH 0/8] ppc: cleanups Cédric Le Goater
2021-09-01  9:41 ` [PATCH 1/8] docs/system: ppc: Update the URL for OpenPOWER firmware images Cédric Le Goater
2021-09-01 10:10   ` Greg Kurz
2021-09-01 11:25     ` Cédric Le Goater
2021-09-01  9:41 ` [PATCH 2/8] ppc/spapr: Add a POWER10 DD2 CPU Cédric Le Goater
2021-09-01 10:11   ` Greg Kurz
2021-09-02  1:34   ` David Gibson
2021-09-01  9:41 ` [PATCH 3/8] ppc/pnv: Add a comment on the "primary-topology-index" property Cédric Le Goater
2021-09-02  1:36   ` David Gibson
2021-09-01  9:41 ` [PATCH 4/8] ppc/pnv: Remove useless variable Cédric Le Goater
2021-09-02  1:36   ` David Gibson
2021-09-01  9:41 ` [PATCH 5/8] ppc/pnv: Add an assert when calculating the RAM distribution on chips Cédric Le Goater
2021-09-02  1:37   ` David Gibson
2021-09-02  6:28     ` Cédric Le Goater
2021-09-02  6:33       ` David Gibson
2021-09-01  9:41 ` [PATCH 6/8] ppc/xive: Export priority_to_ipb() helper Cédric Le Goater
2021-09-02  1:38   ` David Gibson
2021-09-01  9:41 ` [PATCH 7/8] ppc/xive: Export xive_tctx_word2() helper Cédric Le Goater
2021-09-02  1:38   ` David Gibson
2021-09-01  9:41 ` [PATCH 8/8] ppc/pnv: Rename "id" to "quad-id" in PnvQuad Cédric Le Goater
2021-09-02  1:39   ` David Gibson [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YTArU/F/ijVDgJi3@yekko \
    --to=david@gibson.dropbear.id.au \
    --cc=clg@kaod.org \
    --cc=groug@kaod.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --subject='Re: [PATCH 8/8] ppc/pnv: Rename "id" to "quad-id" in PnvQuad' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.