Rename target_phys_addr_t to hwaddr

target_phys_addr_t is unwieldly, violates the C standard (_t suffixes are
reserved) and its purpose doesn't match the name (most target_phys_addr_t
addresses are not target specific).  Replace it with a finger-friendly,
standards conformant hwaddr.

Outstanding patchsets can be fixed up with the command

  git rebase -i --exec 'find -name "*.[ch]"
                        | xargs s/target_phys_addr_t/hwaddr/g' origin

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Avi Kivity 2012-10-23 12:30:10 +02:00 committed by Anthony Liguori
parent 50d2b4d93f
commit a8170e5e97
383 changed files with 2240 additions and 2240 deletions

View file

@ -30,8 +30,8 @@ static void memory_mapping_list_add_mapping_sorted(MemoryMappingList *list,
}
static void create_new_memory_mapping(MemoryMappingList *list,
target_phys_addr_t phys_addr,
target_phys_addr_t virt_addr,
hwaddr phys_addr,
hwaddr virt_addr,
ram_addr_t length)
{
MemoryMapping *memory_mapping;
@ -46,8 +46,8 @@ static void create_new_memory_mapping(MemoryMappingList *list,
}
static inline bool mapping_contiguous(MemoryMapping *map,
target_phys_addr_t phys_addr,
target_phys_addr_t virt_addr)
hwaddr phys_addr,
hwaddr virt_addr)
{
return phys_addr == map->phys_addr + map->length &&
virt_addr == map->virt_addr + map->length;
@ -58,7 +58,7 @@ static inline bool mapping_contiguous(MemoryMapping *map,
* [phys_addr, phys_addr + length) have intersection?
*/
static inline bool mapping_have_same_region(MemoryMapping *map,
target_phys_addr_t phys_addr,
hwaddr phys_addr,
ram_addr_t length)
{
return !(phys_addr + length < map->phys_addr ||
@ -71,8 +71,8 @@ static inline bool mapping_have_same_region(MemoryMapping *map,
* intersection are the same?
*/
static inline bool mapping_conflict(MemoryMapping *map,
target_phys_addr_t phys_addr,
target_phys_addr_t virt_addr)
hwaddr phys_addr,
hwaddr virt_addr)
{
return virt_addr - map->virt_addr != phys_addr - map->phys_addr;
}
@ -83,7 +83,7 @@ static inline bool mapping_conflict(MemoryMapping *map,
* in the intersection are the same.
*/
static inline void mapping_merge(MemoryMapping *map,
target_phys_addr_t virt_addr,
hwaddr virt_addr,
ram_addr_t length)
{
if (virt_addr < map->virt_addr) {
@ -98,8 +98,8 @@ static inline void mapping_merge(MemoryMapping *map,
}
void memory_mapping_list_add_merge_sorted(MemoryMappingList *list,
target_phys_addr_t phys_addr,
target_phys_addr_t virt_addr,
hwaddr phys_addr,
hwaddr virt_addr,
ram_addr_t length)
{
MemoryMapping *memory_mapping, *last_mapping;