diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-24 13:47:42 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-24 13:47:42 -0500 |
| commit | fd469df97ab4277411ecdd4032a2f045a3a87b2a (patch) | |
| tree | 0fb3e1a528047a40c597d79d61cdbca7788af212 /trace-events | |
| parent | 4a542df0910dff2caf17d6bb76bbf3704197db42 (diff) | |
| parent | fd2989341e758813351c2fc1446cc8fbcae06ad9 (diff) | |
| download | qemu-fd469df97ab4277411ecdd4032a2f045a3a87b2a.tar.gz qemu-fd469df97ab4277411ecdd4032a2f045a3a87b2a.tar.bz2 qemu-fd469df97ab4277411ecdd4032a2f045a3a87b2a.zip | |
Merge remote-tracking branch 'bonzini/iommu-for-anthony' into staging
# By Paolo Bonzini (11) and others
# Via Paolo Bonzini
* bonzini/iommu-for-anthony:
memory: clean up phys_page_find
memory: populate FlatView for new address spaces
memory: limit sections in the radix tree to the actual address space size
s390x: reduce TARGET_PHYS_ADDR_SPACE_BITS to 62
memory: fix address space initialization/destruction
memory: make memory_global_sync_dirty_bitmap take an AddressSpace
memory: do not duplicate memory_region_destructor_none
memory: Rename readable flag to romd_mode
memory: Replace open-coded memory_region_is_romd
memory: allow memory_region_find() to run on non-root memory regions
memory: assert that PhysPageEntry's ptr does not overflow
exec: eliminate stq_phys_notdirty
exec: make qemu_get_ram_ptr private
exec: eliminate qemu_put_ram_ptr
exec: remove obsolete comment
Message-id: 1369414987-8839-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/trace-events b/trace-events index f51408aeb2..c5f1ccb96d 100644 --- a/trace-events +++ b/trace-events @@ -813,9 +813,6 @@ xen_map_cache_return(void* ptr) "%p" xen_map_block(uint64_t phys_addr, uint64_t size) "%#"PRIx64", size %#"PRIx64 xen_unmap_block(void* addr, unsigned long size) "%p, size %#lx" -# exec.c -qemu_put_ram_ptr(void* addr) "%p" - # hw/xen_platform.c xen_platform_log(char *s) "xen platform: %s" |