spapr: Fix visibility and traversal of DR connectors

[PATCH 5/6] spapr: Add drc_ prefix to the DRC realize and unrealize functions

Posted by Greg Kurz 5 years, 1 month ago

Use a less generic name for an easier experience with tools such as
cscope or grep.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/ppc/spapr_drc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index a4d2608017c5..8571d5bafe4e 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -503,7 +503,7 @@ static const VMStateDescription vmstate_spapr_drc = {
     }
 };
 
-static void realize(DeviceState *d, Error **errp)
+static void drc_realize(DeviceState *d, Error **errp)
 {
     SpaprDrc *drc = SPAPR_DR_CONNECTOR(d);
     Object *root_container;
@@ -530,7 +530,7 @@ static void realize(DeviceState *d, Error **errp)
     trace_spapr_drc_realize_complete(spapr_drc_index(drc));
 }
 
-static void unrealize(DeviceState *d)
+static void drc_unrealize(DeviceState *d)
 {
     SpaprDrc *drc = SPAPR_DR_CONNECTOR(d);
     Object *root_container;
@@ -579,8 +579,8 @@ static void spapr_dr_connector_class_init(ObjectClass *k, void *data)
 {
     DeviceClass *dk = DEVICE_CLASS(k);
 
-    dk->realize = realize;
-    dk->unrealize = unrealize;
+    dk->realize = drc_realize;
+    dk->unrealize = drc_unrealize;
     /*
      * Reason: DR connector needs to be wired to either the machine or to a
      * PHB in spapr_dr_connector_new().
@@ -628,7 +628,7 @@ static void realize_physical(DeviceState *d, Error **errp)
     SpaprDrcPhysical *drcp = SPAPR_DRC_PHYSICAL(d);
     Error *local_err = NULL;
 
-    realize(d, &local_err);
+    drc_realize(d, &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
         return;
@@ -644,7 +644,7 @@ static void unrealize_physical(DeviceState *d)
 {
     SpaprDrcPhysical *drcp = SPAPR_DRC_PHYSICAL(d);
 
-    unrealize(d);
+    drc_unrealize(d);
     vmstate_unregister(VMSTATE_IF(drcp), &vmstate_spapr_drc_physical, drcp);
     qemu_unregister_reset(drc_physical_reset, drcp);
 }
-- 
2.26.2

Re: [PATCH 5/6] spapr: Add drc_ prefix to the DRC realize and unrealize functions

Posted by Daniel Henrique Barboza 5 years, 1 month ago


On 12/18/20 7:33 AM, Greg Kurz wrote:
> Use a less generic name for an easier experience with tools such as
> cscope or grep.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

>   hw/ppc/spapr_drc.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
> index a4d2608017c5..8571d5bafe4e 100644
> --- a/hw/ppc/spapr_drc.c
> +++ b/hw/ppc/spapr_drc.c
> @@ -503,7 +503,7 @@ static const VMStateDescription vmstate_spapr_drc = {
>       }
>   };
>   
> -static void realize(DeviceState *d, Error **errp)
> +static void drc_realize(DeviceState *d, Error **errp)
>   {
>       SpaprDrc *drc = SPAPR_DR_CONNECTOR(d);
>       Object *root_container;
> @@ -530,7 +530,7 @@ static void realize(DeviceState *d, Error **errp)
>       trace_spapr_drc_realize_complete(spapr_drc_index(drc));
>   }
>   
> -static void unrealize(DeviceState *d)
> +static void drc_unrealize(DeviceState *d)
>   {
>       SpaprDrc *drc = SPAPR_DR_CONNECTOR(d);
>       Object *root_container;
> @@ -579,8 +579,8 @@ static void spapr_dr_connector_class_init(ObjectClass *k, void *data)
>   {
>       DeviceClass *dk = DEVICE_CLASS(k);
>   
> -    dk->realize = realize;
> -    dk->unrealize = unrealize;
> +    dk->realize = drc_realize;
> +    dk->unrealize = drc_unrealize;
>       /*
>        * Reason: DR connector needs to be wired to either the machine or to a
>        * PHB in spapr_dr_connector_new().
> @@ -628,7 +628,7 @@ static void realize_physical(DeviceState *d, Error **errp)
>       SpaprDrcPhysical *drcp = SPAPR_DRC_PHYSICAL(d);
>       Error *local_err = NULL;
>   
> -    realize(d, &local_err);
> +    drc_realize(d, &local_err);
>       if (local_err) {
>           error_propagate(errp, local_err);
>           return;
> @@ -644,7 +644,7 @@ static void unrealize_physical(DeviceState *d)
>   {
>       SpaprDrcPhysical *drcp = SPAPR_DRC_PHYSICAL(d);
>   
> -    unrealize(d);
> +    drc_unrealize(d);
>       vmstate_unregister(VMSTATE_IF(drcp), &vmstate_spapr_drc_physical, drcp);
>       qemu_unregister_reset(drc_physical_reset, drcp);
>   }
>

Re: [PATCH 5/6] spapr: Add drc_ prefix to the DRC realize and unrealize functions

Posted by David Gibson 5 years, 1 month ago

On Fri, Dec 18, 2020 at 11:33:59AM +0100, Greg Kurz wrote:
> Use a less generic name for an easier experience with tools such as
> cscope or grep.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Applied to ppc-for-6.0, thanks.

> ---
>  hw/ppc/spapr_drc.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
> index a4d2608017c5..8571d5bafe4e 100644
> --- a/hw/ppc/spapr_drc.c
> +++ b/hw/ppc/spapr_drc.c
> @@ -503,7 +503,7 @@ static const VMStateDescription vmstate_spapr_drc = {
>      }
>  };
>  
> -static void realize(DeviceState *d, Error **errp)
> +static void drc_realize(DeviceState *d, Error **errp)
>  {
>      SpaprDrc *drc = SPAPR_DR_CONNECTOR(d);
>      Object *root_container;
> @@ -530,7 +530,7 @@ static void realize(DeviceState *d, Error **errp)
>      trace_spapr_drc_realize_complete(spapr_drc_index(drc));
>  }
>  
> -static void unrealize(DeviceState *d)
> +static void drc_unrealize(DeviceState *d)
>  {
>      SpaprDrc *drc = SPAPR_DR_CONNECTOR(d);
>      Object *root_container;
> @@ -579,8 +579,8 @@ static void spapr_dr_connector_class_init(ObjectClass *k, void *data)
>  {
>      DeviceClass *dk = DEVICE_CLASS(k);
>  
> -    dk->realize = realize;
> -    dk->unrealize = unrealize;
> +    dk->realize = drc_realize;
> +    dk->unrealize = drc_unrealize;
>      /*
>       * Reason: DR connector needs to be wired to either the machine or to a
>       * PHB in spapr_dr_connector_new().
> @@ -628,7 +628,7 @@ static void realize_physical(DeviceState *d, Error **errp)
>      SpaprDrcPhysical *drcp = SPAPR_DRC_PHYSICAL(d);
>      Error *local_err = NULL;
>  
> -    realize(d, &local_err);
> +    drc_realize(d, &local_err);
>      if (local_err) {
>          error_propagate(errp, local_err);
>          return;
> @@ -644,7 +644,7 @@ static void unrealize_physical(DeviceState *d)
>  {
>      SpaprDrcPhysical *drcp = SPAPR_DRC_PHYSICAL(d);
>  
> -    unrealize(d);
> +    drc_unrealize(d);
>      vmstate_unregister(VMSTATE_IF(drcp), &vmstate_spapr_drc_physical, drcp);
>      qemu_unregister_reset(drc_physical_reset, drcp);
>  }

-- 
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

[PATCH 1/6] spapr: Call spapr_drc_reset() for all DRCs at CAS
[PATCH 2/6] spapr: Fix reset of transient DR connectors
[PATCH 3/6] spapr: Introduce spapr_drc_reset_all()
[PATCH 4/6] spapr: Use spapr_drc_reset_all() at machine reset
[PATCH 5/6] spapr: Add drc_ prefix to the DRC realize and unrealize functions
[PATCH 6/6] spapr: Model DR connectors as simple objects