]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'qemu-kvm/memory/page_desc' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 3 Jan 2012 20:39:05 +0000 (14:39 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 3 Jan 2012 20:39:05 +0000 (14:39 -0600)
* 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()
  ...

1  2 
arch_init.c
hw/sysbus.c
target-i386/kvm.c
trace-events

diff --cc arch_init.c
Simple merge
diff --cc hw/sysbus.c
Simple merge
Simple merge
diff --cc trace-events
Simple merge