|
 |
9bac43 |
From 3ff6f640c89c152317214aecb7cb8071f60164d5 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
Date: Thu, 16 Nov 2017 03:07:23 +0100
|
|
|
9bac43 |
Subject: [PATCH 19/30] memory: Alloc dispatch tree where topology is generared
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
Message-id: <20171116030732.8560-14-dgibson@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77704
|
|
|
9bac43 |
O-Subject: [PATCH 13/22] memory: Alloc dispatch tree where topology is generared
|
|
|
9bac43 |
Bugzilla: 1481593
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
|
9bac43 |
|
|
|
9bac43 |
This is to make next patches simpler.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
|
9bac43 |
Message-Id: <20170921085110.25598-11-aik@ozlabs.ru>
|
|
|
9bac43 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9bac43 |
(cherry picked from commit 9bf561e36cf8fed9565011a19ba9ea0100e1811e)
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
memory.c | 18 +++++++++---------
|
|
|
9bac43 |
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/memory.c b/memory.c
|
|
|
9bac43 |
index 7972235..8034520 100644
|
|
|
9bac43 |
--- a/memory.c
|
|
|
9bac43 |
+++ b/memory.c
|
|
|
9bac43 |
@@ -742,6 +742,7 @@ static MemoryRegion *memory_region_get_flatview_root(MemoryRegion *mr)
|
|
|
9bac43 |
/* Render a memory topology into a list of disjoint absolute ranges. */
|
|
|
9bac43 |
static FlatView *generate_memory_topology(MemoryRegion *mr)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
+ int i;
|
|
|
9bac43 |
FlatView *view;
|
|
|
9bac43 |
|
|
|
9bac43 |
view = flatview_new(mr);
|
|
|
9bac43 |
@@ -752,6 +753,14 @@ static FlatView *generate_memory_topology(MemoryRegion *mr)
|
|
|
9bac43 |
}
|
|
|
9bac43 |
flatview_simplify(view);
|
|
|
9bac43 |
|
|
|
9bac43 |
+ view->dispatch = address_space_dispatch_new(view);
|
|
|
9bac43 |
+ for (i = 0; i < view->nr; i++) {
|
|
|
9bac43 |
+ MemoryRegionSection mrs =
|
|
|
9bac43 |
+ section_from_flat_range(&view->ranges[i], view);
|
|
|
9bac43 |
+ flatview_add_to_dispatch(view, &mrs);
|
|
|
9bac43 |
+ }
|
|
|
9bac43 |
+ address_space_dispatch_compact(view->dispatch);
|
|
|
9bac43 |
+
|
|
|
9bac43 |
return view;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
@@ -925,15 +934,6 @@ static void address_space_update_topology(AddressSpace *as)
|
|
|
9bac43 |
FlatView *old_view = address_space_get_flatview(as);
|
|
|
9bac43 |
MemoryRegion *physmr = memory_region_get_flatview_root(old_view->root);
|
|
|
9bac43 |
FlatView *new_view = generate_memory_topology(physmr);
|
|
|
9bac43 |
- int i;
|
|
|
9bac43 |
-
|
|
|
9bac43 |
- new_view->dispatch = address_space_dispatch_new(new_view);
|
|
|
9bac43 |
- for (i = 0; i < new_view->nr; i++) {
|
|
|
9bac43 |
- MemoryRegionSection mrs =
|
|
|
9bac43 |
- section_from_flat_range(&new_view->ranges[i], new_view);
|
|
|
9bac43 |
- flatview_add_to_dispatch(new_view, &mrs);
|
|
|
9bac43 |
- }
|
|
|
9bac43 |
- address_space_dispatch_compact(new_view->dispatch);
|
|
|
9bac43 |
|
|
|
9bac43 |
if (!QTAILQ_EMPTY(&as->listeners)) {
|
|
|
9bac43 |
address_space_update_topology_pass(as, old_view, new_view, false);
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|