[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [PATCH] memory: avoid a name clash with access macro
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-trivial] [PATCH] memory: avoid a name clash with access macro |
Date: |
Thu, 21 Sep 2017 14:08:23 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 |
On 21/09/2017 12:04, KONRAD Frederic wrote:
> 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 <address@hidden>
> ---
> memory.c | 19 ++++++++++---------
> 1 file 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);
> }
> }
>
Queued, thanks.
Paolo