diff options
| author | Avi Kivity <avi@redhat.com> | 2012-10-04 12:36:04 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:46:18 -0500 |
| commit | 4be403c8158e1b6be743f0fef004310cea4e3975 (patch) | |
| tree | 3f5282792a3da1214dfb4eb29aaa3004627604a6 /hw/intel-hda.c | |
| parent | e744c06fca438dc08271e626034e632a270c91c8 (diff) | |
| download | focaccia-qemu-4be403c8158e1b6be743f0fef004310cea4e3975.tar.gz focaccia-qemu-4be403c8158e1b6be743f0fef004310cea4e3975.zip | |
Make target_phys_addr_t 64 bits unconditionally
The hassle and compile time overhead of maintaining both 32-bit and 64-bit capable source isn't worth the tiny performance advantage which is seen on a minority of configurations. Switch to compiling libhw only once, with target_phys_addr_t unconditionally typedefed to uint64_t. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/intel-hda.c')
| -rw-r--r-- | hw/intel-hda.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/intel-hda.c b/hw/intel-hda.c index 127e81888b..d8e1b23a60 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -210,13 +210,7 @@ static target_phys_addr_t intel_hda_addr(uint32_t lbase, uint32_t ubase) { target_phys_addr_t addr; -#if TARGET_PHYS_ADDR_BITS == 32 - addr = lbase; -#else - addr = ubase; - addr <<= 32; - addr |= lbase; -#endif + addr = ((uint64_t)ubase << 32) | lbase; return addr; } |