| Message ID | 1311602584-23409-5-git-send-email-avi@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/25/2011 09:02 AM, Avi Kivity wrote: > get_system_memory() provides the root of the memory hierarchy. > > This interface is intended to be private between memory.c and exec.c. > If this file is included elsewhere, it should be regarded as a bug (or > TODO item). However, it will be temporarily needed for the conversion > to hierarchical memory routing. > > Signed-off-by: Avi Kivity<avi@redhat.com> > --- > exec-memory.h | 23 +++++++++++++++++++++++ > memory.c | 7 +++++++ > 2 files changed, 30 insertions(+), 0 deletions(-) > create mode 100644 exec-memory.h > > diff --git a/exec-memory.h b/exec-memory.h > new file mode 100644 > index 0000000..7eb9085 > --- /dev/null > +++ b/exec-memory.h > @@ -0,0 +1,23 @@ Please add a copyright/license. Otherwise, Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Regards, Anthony Liguori > +#ifndef EXEC_MEMORY_H > +#define EXEC_MEMORY_H > + > +/* > + * Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless > + * you're one of them. > + */ > + > +#include "memory.h" > + > +#ifndef CONFIG_USER_ONLY > + > +/* Get the root memory region. This interface should only be used temporarily > + * until a proper bus interface is available. > + */ > +MemoryRegion *get_system_memory(void); > + > +/* Set the root memory region. This region is the system memory map. */ > +void set_system_memory_map(MemoryRegion *mr); > + > +#endif > + > +#endif > diff --git a/memory.c b/memory.c > index 339bea3..48470d2 100644 > --- a/memory.c > +++ b/memory.c > @@ -12,6 +12,7 @@ > */ > > #include "memory.h" > +#include "exec-memory.h" > #include<assert.h> > > typedef struct AddrRange AddrRange; > @@ -698,3 +699,9 @@ void memory_region_del_subregion(MemoryRegion *mr, > QTAILQ_REMOVE(&mr->subregions, subregion, subregions_link); > memory_region_update_topology(); > } > + > +void set_system_memory_map(MemoryRegion *mr) > +{ > + root_memory_region = mr; > + memory_region_update_topology(); > +}
diff --git a/exec-memory.h b/exec-memory.h new file mode 100644 index 0000000..7eb9085 --- /dev/null +++ b/exec-memory.h @@ -0,0 +1,23 @@ +#ifndef EXEC_MEMORY_H +#define EXEC_MEMORY_H + +/* + * Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless + * you're one of them. + */ + +#include "memory.h" + +#ifndef CONFIG_USER_ONLY + +/* Get the root memory region. This interface should only be used temporarily + * until a proper bus interface is available. + */ +MemoryRegion *get_system_memory(void); + +/* Set the root memory region. This region is the system memory map. */ +void set_system_memory_map(MemoryRegion *mr); + +#endif + +#endif diff --git a/memory.c b/memory.c index 339bea3..48470d2 100644 --- a/memory.c +++ b/memory.c @@ -12,6 +12,7 @@ */ #include "memory.h" +#include "exec-memory.h" #include <assert.h> typedef struct AddrRange AddrRange; @@ -698,3 +699,9 @@ void memory_region_del_subregion(MemoryRegion *mr, QTAILQ_REMOVE(&mr->subregions, subregion, subregions_link); memory_region_update_topology(); } + +void set_system_memory_map(MemoryRegion *mr) +{ + root_memory_region = mr; + memory_region_update_topology(); +}
get_system_memory() provides the root of the memory hierarchy. This interface is intended to be private between memory.c and exec.c. If this file is included elsewhere, it should be regarded as a bug (or TODO item). However, it will be temporarily needed for the conversion to hierarchical memory routing. Signed-off-by: Avi Kivity <avi@redhat.com> --- exec-memory.h | 23 +++++++++++++++++++++++ memory.c | 7 +++++++ 2 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 exec-memory.h