Re: [qemu-s390x] [PATCH v2 07/10] hw/isa: Use the QOM DEVICE() macro to access DeviceState.qdev

[Marcel Apfelbaum]

On 5/28/19 7:40 PM, Philippe Mathieu-Daudé wrote:
> Rather than looking inside the definition of a DeviceState with
> "s->qdev", use the QOM prefered style: "DEVICE(s)".
>
> This patch was generated using the following Coccinelle script:
>
>      // Use DEVICE() macros to access DeviceState.qdev
>      @use_device_macro_to_access_qdev@
>      expression obj;
>      identifier dev;
>      @@
>      -&obj->dev.qdev
>      +DEVICE(obj)
>
> Suggested-by: Peter Maydell <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
>   hw/isa/lpc_ich9.c | 2 +-
>   hw/isa/vt82c686.c | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
> index 031ee9cd93..35d17246e9 100644
> --- a/hw/isa/lpc_ich9.c
> +++ b/hw/isa/lpc_ich9.c
> @@ -412,7 +412,7 @@ void ich9_lpc_pm_init(PCIDevice *lpc_pci, bool smm_enabled)
>                                    true);
>       }
>   
> -    ich9_lpc_reset(&lpc->d.qdev);
> +    ich9_lpc_reset(DEVICE(lpc));
>   }
>   
>   /* APM */
> diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
> index 85d0532dd5..d46754f61c 100644
> --- a/hw/isa/vt82c686.c
> +++ b/hw/isa/vt82c686.c
> @@ -369,7 +369,7 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error 
> **errp)
>       pci_conf[0x90] = s->smb_io_base | 1;
>       pci_conf[0x91] = s->smb_io_base >> 8;
>       pci_conf[0xd2] = 0x90;
> -    pm_smbus_init(&s->dev.qdev, &s->smb, false);
> +    pm_smbus_init(DEVICE(s), &s->smb, false);
>       memory_region_add_subregion(get_system_io(), s->smb_io_base, &s->smb.io);
>   
>       apm_init(dev, &s->apm, NULL, s);

Reviewed-by: Marcel Apfelbaum<address@hidden>

Thanks,
Marcel