Message ID | 1386679030.10879.35.camel@localhost.localdomain |
---|---|
State | New |
Headers | show |
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). Paolo
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" Rebasing on top of the later resulted in 0 conflicts/patch unchanged... Thanks, Marcel > > Paolo
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 > >
On Tue, 2013-12-10 at 18:48 +0200, Michael S. Tsirkin wrote: > 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. I checked the patch and the rebase is OK, thanks! Marcel > > > Rebasing on top of the later resulted in 0 conflicts/patch unchanged... > > > > Thanks, > > Marcel > > > > > > > > Paolo > > > >
diff --git a/exec.c b/exec.c index 07992e9..00526d1 100644 --- a/exec.c +++ b/exec.c @@ -269,7 +269,7 @@ static void phys_page_compact_all(AddressSpaceDispatch *d, int nodes_nb) DECLARE_BITMAP(compacted, nodes_nb); if (d->phys_map.skip) { - phys_page_compact(&d->phys_map, d->nodes, compacted); + phys_page_compact(&d->phys_map, d->map.nodes, compacted); } }