diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
commit | c227f0995e1722a1abccc28cadf0664266bd8043 (patch) | |
tree | 39e92c2f818e3e8144978740b914731613af0e40 /cpu-defs.h | |
parent | Get rid of _t suffix (diff) | |
download | qemu-kvm-c227f0995e1722a1abccc28cadf0664266bd8043.tar.gz qemu-kvm-c227f0995e1722a1abccc28cadf0664266bd8043.tar.bz2 qemu-kvm-c227f0995e1722a1abccc28cadf0664266bd8043.zip |
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>
Diffstat (limited to 'cpu-defs.h')
-rw-r--r-- | cpu-defs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpu-defs.h b/cpu-defs.h index a48fb0213..95068b530 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -95,15 +95,15 @@ typedef struct CPUTLBEntry { use the corresponding iotlb value. */ #if TARGET_PHYS_ADDR_BITS == 64 /* on i386 Linux make sure it is aligned */ - a_target_phys_addr addend __attribute__((aligned(8))); + target_phys_addr_t addend __attribute__((aligned(8))); #else - a_target_phys_addr addend; + target_phys_addr_t addend; #endif /* padding to get a power of two size */ uint8_t dummy[(1 << CPU_TLB_ENTRY_BITS) - (sizeof(target_ulong) * 3 + - ((-sizeof(target_ulong) * 3) & (sizeof(a_target_phys_addr) - 1)) + - sizeof(a_target_phys_addr))]; + ((-sizeof(target_ulong) * 3) & (sizeof(target_phys_addr_t) - 1)) + + sizeof(target_phys_addr_t))]; } CPUTLBEntry; #ifdef HOST_WORDS_BIGENDIAN @@ -152,7 +152,7 @@ typedef struct CPUWatchpoint { volatile sig_atomic_t exit_request; \ /* The meaning of the MMU modes is defined in the target code. */ \ CPUTLBEntry tlb_table[NB_MMU_MODES][CPU_TLB_SIZE]; \ - a_target_phys_addr iotlb[NB_MMU_MODES][CPU_TLB_SIZE]; \ + target_phys_addr_t iotlb[NB_MMU_MODES][CPU_TLB_SIZE]; \ struct TranslationBlock *tb_jmp_cache[TB_JMP_CACHE_SIZE]; \ /* buffer for temporaries in the code generator */ \ long temp_buf[CPU_TEMP_BUF_NLONGS]; \ |