Re: [Qemu-devel] [PULL 00/43] QMP queue

[Paolo Bonzini]

Il 23/06/2014 18:39, Luiz Capitulino ha scritto:
> > I've included a fix from Igor that fixes the most serious conflict from my
> > last pull request. Besides, I've fixed some trivial to medium conflicts myself
> > and included my two build fixes. Build tested and tested most events again.

I compared against my own version of the conflict resolution, and the 
only differences were in code around Igor's new event.

So it looks good to me.

Paolo