Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init

[Stefan Hajnoczi]

On Sat, Dec 16, 2017 at 11:52:28AM +0800, Peter Xu wrote:
> On Fri, Dec 15, 2017 at 12:47:11PM +0000, Stefan Hajnoczi wrote:
> > On Fri, Dec 15, 2017 at 04:11:41PM +0800, Peter Xu wrote:
> > > On Wed, Dec 13, 2017 at 03:48:06PM +0000, Stefan Hajnoczi wrote:
> > > > On Tue, Dec 05, 2017 at 01:51:41PM +0800, Peter Xu wrote:
> > > > > diff --git a/vl.c b/vl.c
> > > > > index 1ad1c04637..1ec995a6ae 100644
> > > > > --- a/vl.c
> > > > > +++ b/vl.c
> > > > > @@ -3144,7 +3144,6 @@ int main(int argc, char **argv, char **envp)
> > > > >      qemu_init_exec_dir(argv[0]);
> > > > >  
> > > > >      module_call_init(MODULE_INIT_QOM);
> > > > > -    monitor_init_qmp_commands();
> > > > >  
> > > > >      qemu_add_opts(&qemu_drive_opts);
> > > > >      qemu_add_drive_opts(&qemu_legacy_drive_opts);
> > > > > @@ -4690,6 +4689,8 @@ int main(int argc, char **argv, char **envp)
> > > > >      default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
> > > > >      default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
> > > > >  
> > > > > +    monitor_init_globals();
> > > > 
> > > > Why did you move monitor_init_qmp_commands() down here?
> > > > 
> > > > There are many function calls between the old position and the new
> > > > position.  Did you check all of them to make sure they don't touch the
> > > > monitor which is now totally uninitialized?
> > > 
> > > Yeh, this patch is a bit hairy, but I really think we should do it.
> > > Because there are too many places (as you have seen) that we inited
> > > monitor stuff in different places.
> > 
> > But why did you move it down here?  Can you replace the
> > monitor_init_qmp_commands() call instead?
> 
> I just moved it closer to (actually, right above) initializations of
> monitors to be clear that these globals will never be touched until
> this point.  Or do you want me to move this call exactly back to the
> place where monitor_init_qmp_commands() was called before?  Thanks,

Hmm...now that we're discussing this patch in detail I found an ordering
dependency:

qtest_enabled() only works after configure_accelerator(current_machine),
so the monitor_qapi_event_init() cannot be moved to the
monitor_init_qmp_commands() location.

Everything else has no dependencies.  I would be best to remove the
self-contained init from vl.c:main() so we don't have to worry about
dependencies again.  How about:

-static void __attribute__((constructor)) monitor_lock_init(void)
+static void __attribute__((constructor)) monitor_init_ctr(void)
 {
     qemu_mutex_init(&monitor_lock);
+    monitor_init_qmp_commands();
+    monitor_qapi_event_init();
+    sortcmdlist();
 }

Now vl.c:main() doesn't need to initialize the monitor.

We still need to handle the qtest_enabled() dependency:

-static QEMUClockType event_clock_type = QEMU_CLOCK_REALTIME;
+static inline QEMUClockType event_clock_type(void)
+{
+    return qtest_enabled() ? QEMU_CLOCK_VIRTUAL : QEMU_CLOCK_REALTIME;
+}

This way the qtest_enabled() call is deferred until later when the
accelerators have been initialized.

Stefan

signature.asc
Description: PGP signature