diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-03 14:39:05 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-03 14:39:05 -0600 |
| commit | f3c6a169a39d188e98c17a0a0ebfa7f85e5aafdd (patch) | |
| tree | 11e695213b30090174108824425014ddb5e76da2 /hw/framebuffer.h | |
| parent | 8d3bc5178fbc06cdd89c064ae8f44e77c503e91e (diff) | |
| parent | 586c6230c012d1aced38e5a5614d15052ca4ae7a (diff) | |
| download | qemu-f3c6a169a39d188e98c17a0a0ebfa7f85e5aafdd.zip qemu-f3c6a169a39d188e98c17a0a0ebfa7f85e5aafdd.tar.gz qemu-f3c6a169a39d188e98c17a0a0ebfa7f85e5aafdd.tar.bz2 | |
Merge remote-tracking branch 'qemu-kvm/memory/page_desc' into staging
* qemu-kvm/memory/page_desc: (22 commits)
Remove cpu_get_physical_page_desc()
sparc: avoid cpu_get_physical_page_desc()
virtio-balloon: avoid cpu_get_physical_page_desc()
vhost: avoid cpu_get_physical_page_desc()
kvm: avoid cpu_get_physical_page_desc()
memory: remove CPUPhysMemoryClient
xen: convert to MemoryListener API
memory: temporarily add memory_region_get_ram_addr()
xen, vga: add API for registering the framebuffer
vhost: convert to MemoryListener API
kvm: convert to MemoryListener API
kvm: switch kvm slots to use host virtual address instead of ram_addr_t
memory: add API for observing updates to the physical memory map
memory: replace cpu_physical_sync_dirty_bitmap() with a memory API
framebuffer: drop use of cpu_physical_sync_dirty_bitmap()
loader: remove calls to cpu_get_physical_page_desc()
framebuffer: drop use of cpu_get_physical_page_desc()
memory: introduce memory_region_find()
memory: add memory_region_is_logging()
memory: add memory_region_is_rom()
...
Diffstat (limited to 'hw/framebuffer.h')
| -rw-r--r-- | hw/framebuffer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/framebuffer.h b/hw/framebuffer.h index a3a2146..527a6b8 100644 --- a/hw/framebuffer.h +++ b/hw/framebuffer.h @@ -1,12 +1,15 @@ #ifndef QEMU_FRAMEBUFFER_H #define QEMU_FRAMEBUFFER_H +#include "memory.h" + /* Framebuffer device helper routines. */ typedef void (*drawfn)(void *, uint8_t *, const uint8_t *, int, int); void framebuffer_update_display( DisplayState *ds, + MemoryRegion *address_space, target_phys_addr_t base, int cols, int rows, |