diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-14 08:50:45 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-14 08:50:45 -0600 |
| commit | 5f580e9411a24b7decc07013edeb8abf8d5ae25c (patch) | |
| tree | b5f0120fc2acc4080d09ecd903c647b4e8140bbd /exec.c | |
| parent | ce5e5b522e8d3b848b6445c34226b69c77c46403 (diff) | |
| parent | dd72fdd06268860a24f9f3828efade547ee2e2a9 (diff) | |
| download | focaccia-qemu-5f580e9411a24b7decc07013edeb8abf8d5ae25c.tar.gz focaccia-qemu-5f580e9411a24b7decc07013edeb8abf8d5ae25c.zip | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next: virtio-scsi: use dma_context_memory dma: Define dma_context_memory and use in sysbus-ohci megasas: Correct target/lun mapping scsi-disk: flush cache after disabling it megasas: do not include block_int.h scsi: remove superfluous call to scsi_device_set_ua virtio-scsi: factor checks for VIRTIO_SCSI_S_DRIVER_OK when reporting events scsi: do not return short responses for emulated commands Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/exec.c b/exec.c index af94f9cd86..8435de0bd2 100644 --- a/exec.c +++ b/exec.c @@ -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) |