qom: Rename macros for consistency

[PATCH 47/63] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC

Posted by Eduardo Habkost 5 years, 5 months ago

Make the type checking macro name consistent with the TYPE_*
constant.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: qemu-ppc@nongnu.org
Cc: qemu-devel@nongnu.org
---
 hw/ppc/rs6000_mc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c
index 56e96010b8..8611ffa96d 100644
--- a/hw/ppc/rs6000_mc.c
+++ b/hw/ppc/rs6000_mc.c
@@ -30,7 +30,7 @@
 
 #define TYPE_RS6000MC "rs6000-mc"
 typedef struct RS6000MCState RS6000MCState;
-DECLARE_INSTANCE_CHECKER(RS6000MCState, RS6000MC_DEVICE,
+DECLARE_INSTANCE_CHECKER(RS6000MCState, RS6000MC,
                          TYPE_RS6000MC)
 
 struct RS6000MCState {
@@ -143,7 +143,7 @@ static const MemoryRegionPortio rs6000mc_port_list[] = {
 
 static void rs6000mc_realize(DeviceState *dev, Error **errp)
 {
-    RS6000MCState *s = RS6000MC_DEVICE(dev);
+    RS6000MCState *s = RS6000MC(dev);
     int socket = 0;
     unsigned int ram_size = s->ram_size / MiB;
     Error *local_err = NULL;
-- 
2.26.2

Re: [PATCH 47/63] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC

Posted by Hervé Poussineau 5 years, 5 months ago

Le 03/09/2020 à 00:42, Eduardo Habkost a écrit :
> Make the type checking macro name consistent with the TYPE_*
> constant.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Cc: "Hervé Poussineau" <hpoussin@reactos.org>
> Cc: David Gibson <david@gibson.dropbear.id.au>
> Cc: qemu-ppc@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>   hw/ppc/rs6000_mc.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>

Re: [PATCH 47/63] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC

Posted by Philippe Mathieu-Daudé 5 years, 5 months ago

On 9/3/20 12:42 AM, Eduardo Habkost wrote:
> Make the type checking macro name consistent with the TYPE_*
> constant.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Cc: "Hervé Poussineau" <hpoussin@reactos.org>
> Cc: David Gibson <david@gibson.dropbear.id.au>
> Cc: qemu-ppc@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>  hw/ppc/rs6000_mc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c
> index 56e96010b8..8611ffa96d 100644
> --- a/hw/ppc/rs6000_mc.c
> +++ b/hw/ppc/rs6000_mc.c
> @@ -30,7 +30,7 @@
>  
>  #define TYPE_RS6000MC "rs6000-mc"
>  typedef struct RS6000MCState RS6000MCState;
> -DECLARE_INSTANCE_CHECKER(RS6000MCState, RS6000MC_DEVICE,
> +DECLARE_INSTANCE_CHECKER(RS6000MCState, RS6000MC,
>                           TYPE_RS6000MC)
>  
>  struct RS6000MCState {
> @@ -143,7 +143,7 @@ static const MemoryRegionPortio rs6000mc_port_list[] = {
>  
>  static void rs6000mc_realize(DeviceState *dev, Error **errp)
>  {
> -    RS6000MCState *s = RS6000MC_DEVICE(dev);
> +    RS6000MCState *s = RS6000MC(dev);
>      int socket = 0;
>      unsigned int ram_size = s->ram_size / MiB;
>      Error *local_err = NULL;
> 

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>