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, 9 insertions, 9 deletions

diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c
index f9386603f..655fe8657 100644
--- a/hw/ppc4xx_pci.c
+++ b/hw/ppc4xx_pci.c
@@ -23,7 +23,7 @@
 #include "ppc.h"
 #include "ppc4xx.h"
 
-typedef a_target_phys_addr a_pci_addr;
+typedef target_phys_addr_t pci_addr_t;
 #include "pci.h"
 #include "pci_host.h"
 #include "bswap.h"
@@ -86,7 +86,7 @@ typedef struct PPC4xxPCIState PPC4xxPCIState;
 #define PCI_REG_SIZE        0x40
 
 
-static uint32_t pci4xx_cfgaddr_readl(void *opaque, a_target_phys_addr addr)
+static uint32_t pci4xx_cfgaddr_readl(void *opaque, target_phys_addr_t addr)
 {
     PPC4xxPCIState *ppc4xx_pci = opaque;
 
@@ -99,7 +99,7 @@ static CPUReadMemoryFunc * const pci4xx_cfgaddr_read[] = {
     &pci4xx_cfgaddr_readl,
 };
 
-static void pci4xx_cfgaddr_writel(void *opaque, a_target_phys_addr addr,
+static void pci4xx_cfgaddr_writel(void *opaque, target_phys_addr_t addr,
                                   uint32_t value)
 {
     PPC4xxPCIState *ppc4xx_pci = opaque;
@@ -129,7 +129,7 @@ static CPUWriteMemoryFunc * const pci4xx_cfgdata_write[] = {
     &pci_host_data_writel,
 };
 
-static void ppc4xx_pci_reg_write4(void *opaque, a_target_phys_addr offset,
+static void ppc4xx_pci_reg_write4(void *opaque, target_phys_addr_t offset,
                                   uint32_t value)
 {
     struct PPC4xxPCIState *pci = opaque;
@@ -201,7 +201,7 @@ static void ppc4xx_pci_reg_write4(void *opaque, a_target_phys_addr offset,
     }
 }
 
-static uint32_t ppc4xx_pci_reg_read4(void *opaque, a_target_phys_addr offset)
+static uint32_t ppc4xx_pci_reg_read4(void *opaque, target_phys_addr_t offset)
 {
     struct PPC4xxPCIState *pci = opaque;
     uint32_t value;
@@ -359,10 +359,10 @@ static int ppc4xx_pci_load(QEMUFile *f, void *opaque, int version_id)
 
 /* XXX Interrupt acknowledge cycles not supported. */
 PCIBus *ppc4xx_pci_init(CPUState *env, qemu_irq pci_irqs[4],
-                        a_target_phys_addr config_space,
-                        a_target_phys_addr int_ack,
-                        a_target_phys_addr special_cycle,
-                        a_target_phys_addr registers)
+                        target_phys_addr_t config_space,
+                        target_phys_addr_t int_ack,
+                        target_phys_addr_t special_cycle,
+                        target_phys_addr_t registers)
 {
     PPC4xxPCIState *controller;
     int index;