On 19 November 2018 at 12:08, Mao Zhongyi
<[email protected]> wrote:
> Use DeviceClass rather than SysBusDeviceClass in
> milkymist_hpdmc_class_init().
>
> Cc: [email protected]
> Cc: [email protected]
>
> Signed-off-by: Mao Zhongyi <[email protected]>
> Signed-off-by: Zhang Shengju <[email protected]>
> ---
> hw/intc/puv3_intc.c | 1 +
> hw/misc/milkymist-hpdmc.c | 9 +++------
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c
> index dfef505c47..a3ca6d466b 100644
> --- a/hw/intc/puv3_intc.c
> +++ b/hw/intc/puv3_intc.c
> @@ -119,6 +119,7 @@ static void puv3_intc_realize(DeviceState *dev, Error
> **errp)
> static void puv3_intc_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> +
> dc->realize = puv3_intc_realize;
> }
Stray change to the wrong file ?
> diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c
> index e6140eec6b..44dc0698ec 100644
> --- a/hw/misc/milkymist-hpdmc.c
> +++ b/hw/misc/milkymist-hpdmc.c
> @@ -129,15 +129,13 @@ static void milkymist_hpdmc_reset(DeviceState *d)
> | IODELAY_PLL2_LOCKED;
> }
>
> -static int milkymist_hpdmc_init(SysBusDevice *dev)
> +static void milkymist_hpdmc_realize(DeviceState *dev, Error **errp)
> {
> MilkymistHpdmcState *s = MILKYMIST_HPDMC(dev);
>
> memory_region_init_io(&s->regs_region, OBJECT(dev), &hpdmc_mmio_ops, s,
> "milkymist-hpdmc", R_MAX * 4);
> - sysbus_init_mmio(dev, &s->regs_region);
> -
> - return 0;
> + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->regs_region);
> }
>
> static const VMStateDescription vmstate_milkymist_hpdmc = {
> @@ -153,9 +151,8 @@ static const VMStateDescription vmstate_milkymist_hpdmc =
> {
> static void milkymist_hpdmc_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>
> - k->init = milkymist_hpdmc_init;
> + dc->realize = milkymist_hpdmc_realize;
> dc->reset = milkymist_hpdmc_reset;
> dc->vmsd = &vmstate_milkymist_hpdmc;
> }
thanks
-- PMM
