diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2012-10-29 11:34:32 +1000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-11-12 16:44:57 +0100 |
| commit | 9e11908f12f92e31ea94dc2a4c962c836cba9f2a (patch) | |
| tree | 58ae5eb64276cbd5d0d9a3eeaec7f46ff8514d0a /exec.c | |
| parent | 4003e24fce1df84a2e8c992376ed2c294816c33c (diff) | |
| download | qemu-9e11908f12f92e31ea94dc2a4c962c836cba9f2a.tar.gz | |
dma: Define dma_context_memory and use in sysbus-ohci
Define a new global dma_context_memory which is a DMAContext corresponding
to the global address_space_memory AddressSpace. This can be used by
sysbus peripherals like sysbus-ohci which need to do DMA.
In particular, use it in the sysbus-ohci device, which fixes a
segfault when attempting to use that device.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -34,6 +34,7 @@ #include "hw/xen.h" #include "qemu-timer.h" #include "memory.h" +#include "dma.h" #include "exec-memory.h" #if defined(CONFIG_USER_ONLY) #include <qemu.h> @@ -103,6 +104,7 @@ static MemoryRegion *system_io; AddressSpace address_space_io; AddressSpace address_space_memory; +DMAContext dma_context_memory; MemoryRegion io_mem_ram, io_mem_rom, io_mem_unassigned, io_mem_notdirty; static MemoryRegion io_mem_subpage_ram; @@ -3294,6 +3296,9 @@ static void memory_map_init(void) memory_listener_register(&core_memory_listener, &address_space_memory); memory_listener_register(&io_memory_listener, &address_space_io); memory_listener_register(&tcg_memory_listener, &address_space_memory); + + dma_context_init(&dma_context_memory, &address_space_memory, + NULL, NULL, NULL); } MemoryRegion *get_system_memory(void) |