Revert "Get rid of _t suffix"

In the very least, a change like this requires discussion on the list.

The naming convention is goofy and it causes a massive merge problem.  Something
like this _must_ be presented on the list first so people can provide input
and cope with it.

This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/hw/pci_host.h b/hw/pci_host.h
index 608e8c63d..48862b508 100644
--- a/hw/pci_host.h
+++ b/hw/pci_host.h
@@ -43,41 +43,41 @@ typedef struct {
     PCIBus *bus;
 } PCIHostState;
 
-static void pci_host_data_writeb(void* opaque, a_pci_addr addr, uint32_t val)
+static void pci_host_data_writeb(void* opaque, pci_addr_t addr, uint32_t val)
 {
     PCIHostState *s = opaque;
 
     PCI_DPRINTF("writeb addr " TARGET_FMT_plx " val %x\n",
-                (a_target_phys_addr)addr, val);
+                (target_phys_addr_t)addr, val);
     if (s->config_reg & (1u << 31))
         pci_data_write(s->bus, s->config_reg | (addr & 3), val, 1);
 }
 
-static void pci_host_data_writew(void* opaque, a_pci_addr addr, uint32_t val)
+static void pci_host_data_writew(void* opaque, pci_addr_t addr, uint32_t val)
 {
     PCIHostState *s = opaque;
 #ifdef TARGET_WORDS_BIGENDIAN
     val = bswap16(val);
 #endif
     PCI_DPRINTF("writew addr " TARGET_FMT_plx " val %x\n",
-                (a_target_phys_addr)addr, val);
+                (target_phys_addr_t)addr, val);
     if (s->config_reg & (1u << 31))
         pci_data_write(s->bus, s->config_reg | (addr & 3), val, 2);
 }
 
-static void pci_host_data_writel(void* opaque, a_pci_addr addr, uint32_t val)
+static void pci_host_data_writel(void* opaque, pci_addr_t addr, uint32_t val)
 {
     PCIHostState *s = opaque;
 #ifdef TARGET_WORDS_BIGENDIAN
     val = bswap32(val);
 #endif
     PCI_DPRINTF("writel addr " TARGET_FMT_plx " val %x\n",
-                (a_target_phys_addr)addr, val);
+                (target_phys_addr_t)addr, val);
     if (s->config_reg & (1u << 31))
         pci_data_write(s->bus, s->config_reg, val, 4);
 }
 
-static uint32_t pci_host_data_readb(void* opaque, a_pci_addr addr)
+static uint32_t pci_host_data_readb(void* opaque, pci_addr_t addr)
 {
     PCIHostState *s = opaque;
     uint32_t val;
@@ -86,11 +86,11 @@ static uint32_t pci_host_data_readb(void* opaque, a_pci_addr addr)
         return 0xff;
     val = pci_data_read(s->bus, s->config_reg | (addr & 3), 1);
     PCI_DPRINTF("readb addr " TARGET_FMT_plx " val %x\n",
-                (a_target_phys_addr)addr, val);
+                (target_phys_addr_t)addr, val);
     return val;
 }
 
-static uint32_t pci_host_data_readw(void* opaque, a_pci_addr addr)
+static uint32_t pci_host_data_readw(void* opaque, pci_addr_t addr)
 {
     PCIHostState *s = opaque;
     uint32_t val;
@@ -98,14 +98,14 @@ static uint32_t pci_host_data_readw(void* opaque, a_pci_addr addr)
         return 0xffff;
     val = pci_data_read(s->bus, s->config_reg | (addr & 3), 2);
     PCI_DPRINTF("readw addr " TARGET_FMT_plx " val %x\n",
-                (a_target_phys_addr)addr, val);
+                (target_phys_addr_t)addr, val);
 #ifdef TARGET_WORDS_BIGENDIAN
     val = bswap16(val);
 #endif
     return val;
 }
 
-static uint32_t pci_host_data_readl(void* opaque, a_pci_addr addr)
+static uint32_t pci_host_data_readl(void* opaque, pci_addr_t addr)
 {
     PCIHostState *s = opaque;
     uint32_t val;
@@ -113,7 +113,7 @@ static uint32_t pci_host_data_readl(void* opaque, a_pci_addr addr)
         return 0xffffffff;
     val = pci_data_read(s->bus, s->config_reg | (addr & 3), 4);
     PCI_DPRINTF("readl addr " TARGET_FMT_plx " val %x\n",
-                (a_target_phys_addr)addr, val);
+                (target_phys_addr_t)addr, val);
 #ifdef TARGET_WORDS_BIGENDIAN
     val = bswap32(val);
 #endif