diff options
author | Avi Kivity <avi@redhat.com> | 2011-08-08 16:09:03 +0300 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-08 10:15:53 -0500 |
commit | 309cb471c80e5909710d1ee3c3b50d481496d189 (patch) | |
tree | 6bedfa86adb8acd8377414b368c381a21a210c34 | |
parent | 899adf8149c675c2ca0db870da6f00748ee53d59 (diff) | |
download | qemu-309cb471c80e5909710d1ee3c3b50d481496d189.zip qemu-309cb471c80e5909710d1ee3c3b50d481496d189.tar.gz qemu-309cb471c80e5909710d1ee3c3b50d481496d189.tar.bz2 |
Integrate I/O memory regions into qemu
get_system_io() returns the root I/O memory region.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | exec-memory.h | 5 | ||||
-rw-r--r-- | exec.c | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/exec-memory.h b/exec-memory.h index c439aba..334219f 100644 --- a/exec-memory.h +++ b/exec-memory.h @@ -28,6 +28,11 @@ */ MemoryRegion *get_system_memory(void); +/* Get the root I/O port region. This interface should only be used + * temporarily until a proper bus interface is available. + */ +MemoryRegion *get_system_io(void); + /* Set the root memory region. This region is the system memory map. */ void set_system_memory_map(MemoryRegion *mr); @@ -113,6 +113,7 @@ static int in_migration; RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list) }; static MemoryRegion *system_memory; +static MemoryRegion *system_io; #endif @@ -3830,6 +3831,10 @@ static void memory_map_init(void) system_memory = qemu_malloc(sizeof(*system_memory)); memory_region_init(system_memory, "system", INT64_MAX); set_system_memory_map(system_memory); + + system_io = qemu_malloc(sizeof(*system_io)); + memory_region_init(system_io, "io", 65536); + set_system_io_map(system_io); } MemoryRegion *get_system_memory(void) @@ -3837,6 +3842,11 @@ MemoryRegion *get_system_memory(void) return system_memory; } +MemoryRegion *get_system_io(void) +{ + return system_io; +} + #endif /* !defined(CONFIG_USER_ONLY) */ /* physical memory access (slow version, mainly for debug) */ |