tree 2401d216d437d7c955e9aca466cd29d05128f567
parent 2d1bedcb5eeab947066bff6e7ff34d4b720574a7
parent 07f07b31e57efa6e4f563802136ffa1694a2692b
author Avi Kivity <avi@redhat.com> 1330522731 +0200
committer Avi Kivity <avi@redhat.com> 1330522731 +0200

Merge branch 'memory/core' into for-mst

* memory/core: (30 commits)
  memory: allow phys_map tree paths to terminate early
  memory: unify PhysPageEntry::node and ::leaf
  memory: change phys_page_set() to set multiple pages
  memory: switch phys_page_set() to a recursive implementation
  memory: replace phys_page_find_alloc() with phys_page_set()
  memory: simplify multipage/subpage registration
  memory: give phys_page_find() its own tree search loop
  memory: make phys_page_find() return a MemoryRegionSection
  memory: move tlb flush to MemoryListener commit callback
  memory: unify the two branches of cpu_register_physical_memory_log()
  memory: fix RAM subpages in newly initialized pages
  memory: compress phys_map node pointers to 16 bits
  memory: store MemoryRegionSection pointers in phys_map
  memory: unify phys_map last level with intermediate levels
  memory: remove first level of l1_phys_map
  memory: change memory registration to rebuild the memory map on each change
  memory: support stateless memory listeners
  memory: split memory listener for the two address spaces
  xen: ignore I/O memory regions
  memory: allow MemoryListeners to observe a specific address space
  ...

Conflicts:
	ioport.c

Signed-off-by: Avi Kivity <avi@redhat.com>