mirror of
https://github.com/mii443/qemu.git
synced 2025-12-09 05:58:32 +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
@@ -44,7 +44,7 @@ typedef struct RavenPCIState {
|
||||
PCIDevice dev;
|
||||
} RavenPCIState;
|
||||
|
||||
static inline uint32_t PPC_PCIIO_config(target_phys_addr_t addr)
|
||||
static inline uint32_t PPC_PCIIO_config(hwaddr addr)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -56,7 +56,7 @@ static inline uint32_t PPC_PCIIO_config(target_phys_addr_t addr)
|
||||
return (addr & 0x7ff) | (i << 11);
|
||||
}
|
||||
|
||||
static void ppc_pci_io_write(void *opaque, target_phys_addr_t addr,
|
||||
static void ppc_pci_io_write(void *opaque, hwaddr addr,
|
||||
uint64_t val, unsigned int size)
|
||||
{
|
||||
PREPPCIState *s = opaque;
|
||||
@@ -64,7 +64,7 @@ static void ppc_pci_io_write(void *opaque, target_phys_addr_t addr,
|
||||
pci_data_write(phb->bus, PPC_PCIIO_config(addr), val, size);
|
||||
}
|
||||
|
||||
static uint64_t ppc_pci_io_read(void *opaque, target_phys_addr_t addr,
|
||||
static uint64_t ppc_pci_io_read(void *opaque, hwaddr addr,
|
||||
unsigned int size)
|
||||
{
|
||||
PREPPCIState *s = opaque;
|
||||
@@ -78,7 +78,7 @@ static const MemoryRegionOps PPC_PCIIO_ops = {
|
||||
.endianness = DEVICE_LITTLE_ENDIAN,
|
||||
};
|
||||
|
||||
static uint64_t ppc_intack_read(void *opaque, target_phys_addr_t addr,
|
||||
static uint64_t ppc_intack_read(void *opaque, hwaddr addr,
|
||||
unsigned int size)
|
||||
{
|
||||
return pic_read_irq(isa_pic);
|
||||
|
||||
Reference in New Issue
Block a user