memory: Alloc dispatch tree where topology is generared

This is to make next patches simpler.

Backports commit 9bf561e36cf8fed9565011a19ba9ea0100e1811e from qemu
This commit is contained in:
Alexey Kardashevskiy 2018-03-11 21:41:58 -04:00 committed by Lioncash
parent 037d039a4d
commit 0d9fe8e20c
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -702,6 +702,7 @@ static MemoryRegion *memory_region_get_flatview_root(MemoryRegion *mr)
/* Render a memory topology into a list of disjoint absolute ranges. */
static FlatView *generate_memory_topology(MemoryRegion *mr)
{
int i;
FlatView *view;
view = flatview_new(mr);
@ -712,6 +713,14 @@ static FlatView *generate_memory_topology(MemoryRegion *mr)
}
flatview_simplify(view);
view->dispatch = address_space_dispatch_new(mr->uc, view);
for (i = 0; i < view->nr; i++) {
MemoryRegionSection mrs =
section_from_flat_range(&view->ranges[i], view);
flatview_add_to_dispatch(view, &mrs);
}
address_space_dispatch_compact(view->dispatch);
return view;
}
@ -797,15 +806,6 @@ static void address_space_update_topology(AddressSpace *as)
FlatView *old_view = address_space_get_flatview(as);
MemoryRegion *physmr = memory_region_get_flatview_root(old_view->root);
FlatView *new_view = generate_memory_topology(physmr);
int i;
new_view->dispatch = address_space_dispatch_new(as->uc, new_view);
for (i = 0; i < new_view->nr; i++) {
MemoryRegionSection mrs =
section_from_flat_range(&new_view->ranges[i], new_view);
flatview_add_to_dispatch(new_view, &mrs);
}
address_space_dispatch_compact(new_view->dispatch);
if (!QTAILQ_EMPTY(&as->listeners)) {
address_space_update_topology_pass(as, old_view, new_view, false);