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

diff --git a/hw/sysbus.c b/hw/sysbus.c
index d43660e126..f6516fd1d7 100644
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -38,7 +38,7 @@ void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq)
     }
 }
 
-void sysbus_mmio_map(SysBusDevice *dev, int n, a_target_phys_addr addr)
+void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr)
 {
     assert(n >= 0 && n < dev->num_mmio);
 
@@ -46,7 +46,7 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, a_target_phys_addr addr)
         /* ??? region already mapped here.  */
         return;
     }
-    if (dev->mmio[n].addr != (a_target_phys_addr)-1) {
+    if (dev->mmio[n].addr != (target_phys_addr_t)-1) {
         /* Unregister previous mapping.  */
         cpu_register_physical_memory(dev->mmio[n].addr, dev->mmio[n].size,
                                      IO_MEM_UNASSIGNED);
@@ -82,7 +82,7 @@ void sysbus_pass_irq(SysBusDevice *dev, SysBusDevice *target)
     }
 }
 
-void sysbus_init_mmio(SysBusDevice *dev, a_target_phys_addr size, int iofunc)
+void sysbus_init_mmio(SysBusDevice *dev, target_phys_addr_t size, int iofunc)
 {
     int n;
 
@@ -93,7 +93,7 @@ void sysbus_init_mmio(SysBusDevice *dev, a_target_phys_addr size, int iofunc)
     dev->mmio[n].iofunc = iofunc;
 }
 
-void sysbus_init_mmio_cb(SysBusDevice *dev, a_target_phys_addr size,
+void sysbus_init_mmio_cb(SysBusDevice *dev, target_phys_addr_t size,
                          mmio_mapfunc cb)
 {
     int n;
@@ -133,7 +133,7 @@ void sysbus_register_dev(const char *name, size_t size, sysbus_initfn init)
 }
 
 DeviceState *sysbus_create_varargs(const char *name,
-                                   a_target_phys_addr addr, ...)
+                                   target_phys_addr_t addr, ...)
 {
     DeviceState *dev;
     SysBusDevice *s;
@@ -144,7 +144,7 @@ DeviceState *sysbus_create_varargs(const char *name,
     dev = qdev_create(NULL, name);
     s = sysbus_from_qdev(dev);
     qdev_init(dev);
-    if (addr != (a_target_phys_addr)-1) {
+    if (addr != (target_phys_addr_t)-1) {
         sysbus_mmio_map(s, 0, addr);
     }
     va_start(va, addr);