Am 07.03.2014 06:32, schrieb Marcel Apfelbaum: > On Fri, 2014-03-07 at 00:44 +0100, Andreas Färber wrote: >> Am 05.03.2014 18:30, schrieb Marcel Apfelbaum: >>> In order to allow attaching machine options to a machine instance, >>> current_machine is converted into MachineState. >>> As a first step of deprecating QEMUMachine, some of the functions >>> were modified to return MachineCLass. >>> >>> Signed-off-by: Marcel Apfelbaum <marce...@redhat.com> >> >> Looks mostly good, but same issue as Alexey's patch: We are risking >> qdev_get_machine() creating a Container-typed /machine node. >> >> What about the following on top? > Hi Andreas, > > I checked with the debugger and qdev_get_machine is called > long after we add the machine to the QOM tree. > However, the race still exists as someone can call qdev_get_machine > before the machine is added to the tree, not being aware of that. > > Your change solves the problem, thank you! > Do you want me to add this diff and resend, > or I will send yours separately?
My preference would be to avoid another round of review on my part by simply squashing into your 3/3. Cheers, Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
