aboutsummaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authorKONRAD Frederic <frederic.konrad@adacore.com>2017-09-21 12:04:20 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2017-09-21 14:08:17 +0200
commit05e015f73c3b5c50c237d3d8e555e25cfa543a5c (patch)
treec7e081d9c3ffebe1b4de437c5e31f34adf2accbd /memory.c
parent3110cdbd8a4845c5b5fb861b0a664c56d993dd3c (diff)
downloadqemu-05e015f73c3b5c50c237d3d8e555e25cfa543a5c.zip
qemu-05e015f73c3b5c50c237d3d8e555e25cfa543a5c.tar.gz
qemu-05e015f73c3b5c50c237d3d8e555e25cfa543a5c.tar.bz2
memory: avoid a name clash with access macro
This avoids a name clash with the access macro on windows 64: make CHK version_gen.h CC aarch64-softmmu/memory.o /home/konrad/qemu/memory.c: In function 'access_with_adjusted_size': /home/konrad/qemu/memory.c:591:73: error: macro "access" passed 7 arguments, \ but takes just 2 (size - access_size - i) * 8, access_mask, attrs); ^ Signed-off-by: KONRAD Frederic <frederic.konrad@adacore.com> Message-Id: <1505988260-8483-1-git-send-email-frederic.konrad@adacore.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/memory.c b/memory.c
index b9920a6..2b90117 100644
--- a/memory.c
+++ b/memory.c
@@ -560,13 +560,14 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
unsigned size,
unsigned access_size_min,
unsigned access_size_max,
- MemTxResult (*access)(MemoryRegion *mr,
- hwaddr addr,
- uint64_t *value,
- unsigned size,
- unsigned shift,
- uint64_t mask,
- MemTxAttrs attrs),
+ MemTxResult (*access_fn)
+ (MemoryRegion *mr,
+ hwaddr addr,
+ uint64_t *value,
+ unsigned size,
+ unsigned shift,
+ uint64_t mask,
+ MemTxAttrs attrs),
MemoryRegion *mr,
MemTxAttrs attrs)
{
@@ -587,12 +588,12 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
access_mask = -1ULL >> (64 - access_size * 8);
if (memory_region_big_endian(mr)) {
for (i = 0; i < size; i += access_size) {
- r |= access(mr, addr + i, value, access_size,
+ r |= access_fn(mr, addr + i, value, access_size,
(size - access_size - i) * 8, access_mask, attrs);
}
} else {
for (i = 0; i < size; i += access_size) {
- r |= access(mr, addr + i, value, access_size, i * 8,
+ r |= access_fn(mr, addr + i, value, access_size, i * 8,
access_mask, attrs);
}
}