mirror of https://gitlab.com/qemu-project/qemu
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>
This commit is contained in:
parent
3110cdbd8a
commit
05e015f73c
19
memory.c
19
memory.c
|
@ -560,13 +560,14 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
|
||||||
unsigned size,
|
unsigned size,
|
||||||
unsigned access_size_min,
|
unsigned access_size_min,
|
||||||
unsigned access_size_max,
|
unsigned access_size_max,
|
||||||
MemTxResult (*access)(MemoryRegion *mr,
|
MemTxResult (*access_fn)
|
||||||
hwaddr addr,
|
(MemoryRegion *mr,
|
||||||
uint64_t *value,
|
hwaddr addr,
|
||||||
unsigned size,
|
uint64_t *value,
|
||||||
unsigned shift,
|
unsigned size,
|
||||||
uint64_t mask,
|
unsigned shift,
|
||||||
MemTxAttrs attrs),
|
uint64_t mask,
|
||||||
|
MemTxAttrs attrs),
|
||||||
MemoryRegion *mr,
|
MemoryRegion *mr,
|
||||||
MemTxAttrs attrs)
|
MemTxAttrs attrs)
|
||||||
{
|
{
|
||||||
|
@ -587,12 +588,12 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
|
||||||
access_mask = -1ULL >> (64 - access_size * 8);
|
access_mask = -1ULL >> (64 - access_size * 8);
|
||||||
if (memory_region_big_endian(mr)) {
|
if (memory_region_big_endian(mr)) {
|
||||||
for (i = 0; i < size; i += access_size) {
|
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);
|
(size - access_size - i) * 8, access_mask, attrs);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for (i = 0; i < size; i += access_size) {
|
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);
|
access_mask, attrs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue