Commit a30c34d2 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Laurent Vivier
Browse files

hw/isa: Use the QOM DEVICE() macro to access DeviceState.qdev 



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: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel.apfelbaum@gmail.com>
Message-Id: <20190528164020.32250-8-philmd@redhat.com>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 5027da92

hw/isa/lpc_ich9.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

hw/isa/vt82c686.c

+1 −1
Original line number Diff line number Diff line
@@ -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);