| Message ID | 20190729145654.14644-11-damien.hedde@greensocs.com |
|---|---|
| State | New |
| Headers | show |
| Series | Multi-phase reset mechanism | expand |
On Mon, 29 Jul 2019 at 15:59, Damien Hedde <damien.hedde@greensocs.com> wrote: > > Replace deprecated qbus_reset_all by resettable_reset_cold_fn for > the sysbus reset registration. > This does not impact the behavior. > > Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> > --- > vl.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/vl.c b/vl.c > index b426b32134..5a465c8236 100644 > --- a/vl.c > +++ b/vl.c > @@ -4421,7 +4421,11 @@ int main(int argc, char **argv, char **envp) > > /* TODO: once all bus devices are qdevified, this should be done > * when bus is created by qdev.c */ > - qemu_register_reset(qbus_reset_all_fn, sysbus_get_default()); > + /* > + * TODO: when we have a main reset container/domain object, use > + * it to fully benefit from multi-phase reset > + */ Let's be a bit more specific with the todo comment while the detail is fresh in our minds: /* * TODO: If we had a main 'reset container' that the whole system * lived in, we could reset that using the multi-phase reset * APIs. For the moment, we just reset the sysbus, which will cause * all devices hanging off it (and all their child buses, recursively) * to be reset. Note that this will *not* reset any Device objects * which are not attached to some part of the qbus tree! */ > + qemu_register_reset(resettable_reset_cold_fn, sysbus_get_default()); > qemu_run_machine_init_done_notifiers(); > > if (rom_check_and_register_reset() != 0) { > -- > 2.22.0 Otherwise Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/vl.c b/vl.c index b426b32134..5a465c8236 100644 --- a/vl.c +++ b/vl.c @@ -4421,7 +4421,11 @@ int main(int argc, char **argv, char **envp) /* TODO: once all bus devices are qdevified, this should be done * when bus is created by qdev.c */ - qemu_register_reset(qbus_reset_all_fn, sysbus_get_default()); + /* + * TODO: when we have a main reset container/domain object, use + * it to fully benefit from multi-phase reset + */ + qemu_register_reset(resettable_reset_cold_fn, sysbus_get_default()); qemu_run_machine_init_done_notifiers(); if (rom_check_and_register_reset() != 0) {
Replace deprecated qbus_reset_all by resettable_reset_cold_fn for the sysbus reset registration. This does not impact the behavior. Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> --- vl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)