On Tue, Dec 10, 2013 at 02:50:32PM +0200, Marcel Apfelbaum wrote: > On Tue, 2013-12-10 at 13:38 +0100, Paolo Bonzini wrote: > > Il 10/12/2013 13:37, Marcel Apfelbaum ha scritto: > > > > > > Beside this it looks OK, the branch does not compile and I couldn't look > > > into it more... > > > Can you please also merge my other patch > > > "memory.c: bugfix - ref counting mismatch in memory_region_find" ? > > > > Regarding the compilation issue, I suggest rebasing on top of Stefan's > > pull request (commit ac9524d, qemu-iotests: filter QEMU monitor \r\n, > > 2013-11-14). > Sure, thanks, but Michael specifically asked for his pci branch, > probably because it conflicts with his patch: > "exec: memory radix tree page level compression" > which is long (~50 patches) after "qemu-iotests: filter QEMU monitor \r\n"
Exactly. Pls take a look, I think I fixed the issues with the rebase. > Rebasing on top of the later resulted in 0 conflicts/patch unchanged... > > Thanks, > Marcel > > > > > Paolo > >
