commit c227f0995e1722a1abccc28cadf0664266bd8043
author Anthony Liguori <aliguori@us.ibm.com> Thu Oct 01 16:12:16 2009 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Thu Oct 01 16:12:16 2009 -0500
tree 39e92c2f818e3e8144978740b914731613af0e40
parent 99a0949b720a0936da2052cb9a46db04ffc6db29

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>

vl.c

diff --git a/vl.c b/vl.c
index 446075c..7bfd415 100644
--- a/vl.c
+++ b/vl.c
@@ -186,7 +186,7 @@
 static DisplayState *display_state;
 DisplayType display_type = DT_DEFAULT;
 const char* keyboard_layout = NULL;
-a_ram_addr ram_size;
+ram_addr_t ram_size;
 int nb_nics;
 NICInfo nd_table[MAX_NICS];
 int vm_running;
@@ -273,7 +273,7 @@
 /***********************************************************/
 /* x86 ISA bus support */
 
-a_target_phys_addr isa_mem_base = 0;
+target_phys_addr_t isa_mem_base = 0;
 PicState2 *isa_pic;
 
 /***********************************************************/
@@ -324,13 +324,13 @@
     qemu_balloon_event_opaque = opaque;
 }
 
-void qemu_balloon(a_ram_addr target)
+void qemu_balloon(ram_addr_t target)
 {
     if (qemu_balloon_event)
         qemu_balloon_event(qemu_balloon_event_opaque, target);
 }
 
-a_ram_addr qemu_balloon_status(void)
+ram_addr_t qemu_balloon_status(void)
 {
     if (qemu_balloon_event)
         return qemu_balloon_event(qemu_balloon_event_opaque, 0);
@@ -1670,7 +1670,7 @@
 static int bt_hci_parse(const char *str)
 {
     struct HCIInfo *hci;
-    a_bdaddr bdaddr;
+    bdaddr_t bdaddr;
 
     if (nb_hcis >= MAX_NICS) {
         fprintf(stderr, "qemu: Too many bluetooth HCIs (max %i).\n", MAX_NICS);
@@ -2805,9 +2805,9 @@
 
 static int ram_save_block(QEMUFile *f)
 {
-    static a_ram_addr current_addr = 0;
-    a_ram_addr saved_addr = current_addr;
-    a_ram_addr addr = 0;
+    static ram_addr_t current_addr = 0;
+    ram_addr_t saved_addr = current_addr;
+    ram_addr_t addr = 0;
     int found = 0;
 
     while (addr < last_ram_offset) {
@@ -2840,10 +2840,10 @@
 
 static uint64_t bytes_transferred = 0;
 
-static a_ram_addr ram_save_remaining(void)
+static ram_addr_t ram_save_remaining(void)
 {
-    a_ram_addr addr;
-    a_ram_addr count = 0;
+    ram_addr_t addr;
+    ram_addr_t count = 0;
 
     for (addr = 0; addr < last_ram_offset; addr += TARGET_PAGE_SIZE) {
         if (cpu_physical_memory_get_dirty(addr, MIGRATION_DIRTY_FLAG))
@@ -2870,7 +2870,7 @@
 
 static int ram_save_live(QEMUFile *f, int stage, void *opaque)
 {
-    a_ram_addr addr;
+    ram_addr_t addr;
     uint64_t bytes_transferred_last;
     double bwidth = 0;
     uint64_t expected_time = 0;
@@ -2933,7 +2933,7 @@
 
 static int ram_load(QEMUFile *f, void *opaque, int version_id)
 {
-    a_ram_addr addr;
+    ram_addr_t addr;
     int flags;
 
     if (version_id != 3)
@@ -5038,7 +5038,7 @@
                     fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n");
                     exit(1);
                 }
-                if (value != (uint64_t)(a_ram_addr)value) {
+                if (value != (uint64_t)(ram_addr_t)value) {
                     fprintf(stderr, "qemu: ram size too large\n");
                     exit(1);
                 }