On Thu, May 12, 2016 at 06:22:36PM +0200, Andreas Färber wrote: > Am 12.05.2016 um 14:26 schrieb Eduardo Habkost: > > On Fri, Jan 29, 2016 at 12:15:12PM -0200, Eduardo Habkost wrote: > >> On Thu, Jan 28, 2016 at 07:01:12PM +0200, Michael S. Tsirkin wrote: > >>> On Thu, Jan 28, 2016 at 01:02:26PM -0200, Eduardo Habkost wrote: > >>>> If the same GlobalProperty struct is registered twice, the list > >>>> entry gets corrupted, making tqe_next points to itself, and > >>>> qdev_prop_set_globals() gets stuck in a loop. The bug can be > >>>> easily reproduced by running: > >>>> > >>>> $ qemu-system-x86_64 -rtc-td-hack -rtc-td-hack > >>>> > >>>> Change global_props to use GList instead of queue.h, making the > >>>> code simpler and able to deal with properties being registered > >>>> twice. > >>>> > >>>> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > >>> > >>> Reviewed-by: Michael S. Tsirkin <m...@redhat.com> > >> > >> Thanks! It seems we don't have a maintainer for hw/core/qdev*. > >> Who should merge this? > > > > I've just noticed that this didn't get included. Andreas, is it > > OK if I merge this through the machine core tree? > > In general I don't mind about those lists, but I still have the bus > refactoring sitting in my tree that didn't make it into 2.6 because > someone made last-minute changes to osdep.h that resulted in hundreds of > errors in my tree... If you make sure it doesn't conflict, feel free to > take it.
Which branch should I look at, to ensure it doesn't conflict? -- Eduardo
