Le 28/05/2019 à 18:40, Philippe Mathieu-Daudé a écrit : > 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 <[email protected]> > Signed-off-by: Philippe Mathieu-Daudé <[email protected]> > --- > hw/watchdog/wdt_i6300esb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c > index 1c6eddf86a..f2d1e86526 100644 > --- a/hw/watchdog/wdt_i6300esb.c > +++ b/hw/watchdog/wdt_i6300esb.c > @@ -200,7 +200,7 @@ static void i6300esb_timer_expired(void *vp) > if (d->reboot_enabled) { > d->previous_reboot_flag = 1; > watchdog_perform_action(); /* This reboots, exits, etc */ > - i6300esb_reset(&d->dev.qdev); > + i6300esb_reset(DEVICE(d)); > } > > /* In "free running mode" we start stage 1 again. */ >
Applied to my trivial-patches branch. Thanks, Laurent
