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>
diff --git a/hw/apic.c b/hw/apic.c
index b96275e..2c414c1 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -661,25 +661,25 @@
apic_timer_update(s, s->next_time);
}
-static uint32_t apic_mem_readb(void *opaque, a_target_phys_addr addr)
+static uint32_t apic_mem_readb(void *opaque, target_phys_addr_t addr)
{
return 0;
}
-static uint32_t apic_mem_readw(void *opaque, a_target_phys_addr addr)
+static uint32_t apic_mem_readw(void *opaque, target_phys_addr_t addr)
{
return 0;
}
-static void apic_mem_writeb(void *opaque, a_target_phys_addr addr, uint32_t val)
+static void apic_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
{
}
-static void apic_mem_writew(void *opaque, a_target_phys_addr addr, uint32_t val)
+static void apic_mem_writew(void *opaque, target_phys_addr_t addr, uint32_t val)
{
}
-static uint32_t apic_mem_readl(void *opaque, a_target_phys_addr addr)
+static uint32_t apic_mem_readl(void *opaque, target_phys_addr_t addr)
{
CPUState *env;
APICState *s;
@@ -760,7 +760,7 @@
return val;
}
-static void apic_send_msi(a_target_phys_addr addr, uint32 data)
+static void apic_send_msi(target_phys_addr_t addr, uint32 data)
{
uint8_t dest = (addr & MSI_ADDR_DEST_ID_MASK) >> MSI_ADDR_DEST_ID_SHIFT;
uint8_t vector = (data & MSI_DATA_VECTOR_MASK) >> MSI_DATA_VECTOR_SHIFT;
@@ -771,7 +771,7 @@
apic_deliver_irq(dest, dest_mode, delivery, vector, 0, trigger_mode);
}
-static void apic_mem_writel(void *opaque, a_target_phys_addr addr, uint32_t val)
+static void apic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
{
CPUState *env;
APICState *s;
