mirror of
https://github.com/mii443/qemu.git
synced 2025-12-16 17:18:49 +00:00
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:
committed by
Anthony Liguori
parent
50d2b4d93f
commit
a8170e5e97
@@ -71,7 +71,7 @@ void macio_nvram_write (void *opaque, uint32_t addr, uint32_t val)
|
||||
}
|
||||
|
||||
/* macio style NVRAM device */
|
||||
static void macio_nvram_writeb(void *opaque, target_phys_addr_t addr,
|
||||
static void macio_nvram_writeb(void *opaque, hwaddr addr,
|
||||
uint64_t value, unsigned size)
|
||||
{
|
||||
MacIONVRAMState *s = opaque;
|
||||
@@ -81,7 +81,7 @@ static void macio_nvram_writeb(void *opaque, target_phys_addr_t addr,
|
||||
NVR_DPRINTF("writeb addr %04x val %x\n", (int)addr, value);
|
||||
}
|
||||
|
||||
static uint64_t macio_nvram_readb(void *opaque, target_phys_addr_t addr,
|
||||
static uint64_t macio_nvram_readb(void *opaque, hwaddr addr,
|
||||
unsigned size)
|
||||
{
|
||||
MacIONVRAMState *s = opaque;
|
||||
@@ -116,7 +116,7 @@ static void macio_nvram_reset(void *opaque)
|
||||
{
|
||||
}
|
||||
|
||||
MacIONVRAMState *macio_nvram_init (target_phys_addr_t size,
|
||||
MacIONVRAMState *macio_nvram_init (hwaddr size,
|
||||
unsigned int it_shift)
|
||||
{
|
||||
MacIONVRAMState *s;
|
||||
@@ -135,7 +135,7 @@ MacIONVRAMState *macio_nvram_init (target_phys_addr_t size,
|
||||
}
|
||||
|
||||
void macio_nvram_setup_bar(MacIONVRAMState *s, MemoryRegion *bar,
|
||||
target_phys_addr_t mem_base)
|
||||
hwaddr mem_base)
|
||||
{
|
||||
memory_region_add_subregion(bar, mem_base, &s->mem);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user