From 1c0ffa58afab4d8496795d29b70d5e9e67e9341e Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 26 Jul 2011 14:26:04 +0300 Subject: [PATCH] Internal interfaces for memory API 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. Reviewed-by: Anthony Liguori Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori --- exec-memory.h | 36 ++++++++++++++++++++++++++++++++++++ memory.c | 7 +++++++ 2 files changed, 43 insertions(+) create mode 100644 exec-memory.h diff --git a/exec-memory.h b/exec-memory.h new file mode 100644 index 0000000000..aea1b45654 --- /dev/null +++ b/exec-memory.h @@ -0,0 +1,36 @@ +/* + * Internal memory managment interfaces + * + * Copyright 2011 Red Hat, Inc. and/or its affiliates + * + * Authors: + * Avi Kivity + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#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 121f9e144e..fcb612e367 100644 --- a/memory.c +++ b/memory.c @@ -12,6 +12,7 @@ */ #include "memory.h" +#include "exec-memory.h" #include typedef struct AddrRange AddrRange; @@ -703,3 +704,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(); +}